X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=606b957121a1f3ad8aca0cfee46d4a70965f3826;hb=d033d98b73c8ad5470e63e56afc9ee01024cb3d3;hp=a7190c40e3e74eaca20ba93bd43db72a4b6d4eea;hpb=30a057c91ec029d7b37751d5e869bafa733427c7;p=vlc

diff --git a/configure.in b/configure.in
index a7190c40e3..606b957121 100644
--- a/configure.in
+++ b/configure.in
@@ -84,6 +84,7 @@ case "x${target_os}" in
   xdarwin*)
     SYS=darwin
     save_CFLAGS="${save_CFLAGS} -no-cpp-precomp"; CFLAGS="${save_CFLAGS}"
+    vlc_LDFLAGS="${vlc_LDFLAGS} -all_load"
     ;;
   x*mingw32*)
     SYS=mingw32
@@ -120,6 +121,7 @@ then
   plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct"
 else
   plugins_CFLAGS="${plugins_CFLAGS} -fPIC"
+  plugins_LDFLAGS="${plugins_LDFLAGS} -fPIC"
 fi
 
 dnl The -DSYS_FOO flag
@@ -143,13 +145,18 @@ AC_CHECK_FUNC(gethostbyname,,[
 AC_CHECK_FUNC(gethostbyname,,[
   AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind")
 ])
-AC_CHECK_FUNCS(nanosleep,,[
+have_nanosleep=0
+AC_CHECK_FUNC(nanosleep,have_nanosleep=1,[
   AC_CHECK_LIB(rt,nanosleep,
-    [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"],
+    [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"; have_nanosleep=1],
     [AC_CHECK_LIB(posix4,nanosleep,
-        [vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"])]
+        [vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"; have_nanosleep=1])]
   )
 ])
+if test x$have_nanosleep = x1; then
+  AC_DEFINE(HAVE_NANOSLEEP, 1,
+            Define if nanosleep is available.)
+fi
 AC_CHECK_FUNC(inet_aton,,[
   AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv")
 ])
@@ -184,16 +191,16 @@ AC_CHECK_LIB(m,pow,
 dnl Check for pthreads - borrowed from XMMS
 THREAD_LIB=error
 if test "x${THREAD_LIB}" = "xerror"; then
-  AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+  AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
 fi
 if test "x${THREAD_LIB}" = "xerror"; then
-  AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads")
+  AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads")
 fi
 if test "x${THREAD_LIB}" = "xerror"; then
-  AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r")
+  AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
 fi
 if test "x${THREAD_LIB}" = "xerror"; then
-  AC_CHECK_FUNC(pthread_attr_init)
+  AC_CHECK_FUNC(pthread_mutex_lock)
   THREAD_LIB=""
 fi
 
@@ -962,6 +969,20 @@ then
   fi
 fi
 
+dnl 
+dnl MP4 module 
+dnl 
+AC_ARG_ENABLE(mp4,
+  [  --enable-mp4            MP4 demux module (default disabled)])
+if test "x${enable_mp4}" = "xyes"
+then
+    AC_CHECK_HEADER(zlib.h,
+        AC_CHECK_LIB(z, inflateEnd,
+            [ PLUGINS="${PLUGINS} mp4"
+              mp4_LDFLAGS="${mp4_LDFLAGS} -lz" ], 
+            [ AC_MSG_ERROR([cannot find zlib library...]) ]),
+        [  AC_MSG_ERROR([cannot find zlib header...]) ])
+fi
 
 dnl special case for BeOS
 if test "x${SYS}" = "xbeos"
@@ -1779,6 +1800,7 @@ AC_SUBST(mpeg_ts_dvbpsi_LDFLAGS)
 AC_SUBST(esd_LDFLAGS)
 AC_SUBST(filter_distort_LDFLAGS)
 AC_SUBST(ffmpeg_LDFLAGS)
+AC_SUBST(mp4_LDFLAGS)
 AC_SUBST(ggi_LDFLAGS)
 AC_SUBST(glide_LDFLAGS)
 AC_SUBST(gnome_LDFLAGS)