X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=23d848e514717c0a1647a260f34e62c51aedb6f0;hb=8cc8d9579d12da1f3a00ea9f870803d67c5c091c;hp=9e25b8779d2a2d43dab9933306927d113e90a55e;hpb=f5c0a050bde3ef1dc115f61d7f86860624fc6405;p=vlc

diff --git a/configure.in b/configure.in
index 9e25b8779d..23d848e514 100644
--- a/configure.in
+++ b/configure.in
@@ -177,7 +177,7 @@ AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.h)
 AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
-AC_CHECK_HEADERS(machine/param.h)
+AC_CHECK_HEADERS(machine/param.h sys/shm.h)
 
 AC_HEADER_TIME
 
@@ -715,14 +715,6 @@ AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debug mode (default disabled)],
 [ if test x$enableval = xyes; then DEBUG=1; fi ])
 
-dnl
-dnl  Trace mode
-dnl
-TRACE=0
-AC_ARG_ENABLE(trace,
-[  --enable-trace          Enable trace mode (default disabled)],
-[ if test x$enableval = xyes; then TRACE=1; fi ])
-
 dnl
 dnl  Profiling
 dnl
@@ -911,6 +903,12 @@ then
   BUILTINS="${BUILTINS} vcd"
 fi
 
+if test x$enable_vcd != xno -a "${SYS}" = "darwin"
+then
+  BUILTINS="${BUILTINS} vcd"
+  LIB_VCD="${LIB_VCD} -framework IOKit" 
+fi
+
 dnl
 dnl  dummy plugin
 dnl
@@ -919,7 +917,18 @@ AC_ARG_ENABLE(dummy,
 
 if test x$enable_dummy != xno
 then
-  BUILTINS="${BUILTINS} dummy"
+  PLUGINS="${PLUGINS} dummy"
+fi
+
+dnl
+dnl  log plugin
+dnl
+AC_ARG_ENABLE(logger,
+  [  --disable-logger        file logger module (default enabled)])
+
+if test x$enable_logger != xno
+then
+  PLUGINS="${PLUGINS} logger"
 fi
 
 dnl
@@ -930,7 +939,7 @@ AC_ARG_ENABLE(null,
 
 if test x$enable_null != xno
 then
-  BUILTINS="${BUILTINS} null"
+  PLUGINS="${PLUGINS} null"
 fi
 
 dnl
@@ -941,7 +950,7 @@ AC_ARG_ENABLE(rc,
 
 if test x$enable_rc != xno
 then
-  BUILTINS="${BUILTINS} rc"
+  PLUGINS="${PLUGINS} rc"
 fi
 
 dnl
@@ -976,7 +985,7 @@ AC_ARG_WITH(mad,
 dnl special case for BeOS
 if test x$SYS = xbeos
 then
-    BUILTINS="${BUILTINS} beos"
+    PLUGINS="${PLUGINS} beos"
 
 dnl default case
 else
@@ -1061,15 +1070,15 @@ AC_ARG_ENABLE(qnx,
     fi
 
 dnl
-dnl  Liba52 AC3 decoder plugin
+dnl  a52 AC3 decoder plugin
 dnl
-AC_ARG_ENABLE(liba52,
-  [  --disable-liba52        AC3 support with liba52 (default enabled)])
-if ((test "x$enableval" != "xno") && (test x$SYS != xmingw32))
+AC_ARG_ENABLE(a52,
+  [  --disable-a52           AC3 support with liba52 (default enabled)])
+if test "x$enableval" != "xno" -a x$SYS != xmingw32
   then
     AC_CHECK_HEADERS(a52dec/a52.h, [
-      BUILTINS="${BUILTINS} liba52_adec"
-      LIB_LIBA52_ADEC="${LIB_LIBA52_ADEC} -la52"
+      BUILTINS="${BUILTINS} a52"
+      LIB_A52="${LIB_A52} -la52"
      ],[])
 fi
 
@@ -1178,12 +1187,12 @@ then
     [  --with-directx-path=path Win32 DirectX headers and libraries])
     if test "x$with_directx_path" = "x"
     then
-      AC_CHECK_HEADERS(directx.h,
+      AC_CHECK_HEADERS(ddraw.h,
       [ PLUGINS="${PLUGINS} directx"
         LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ])
     else
       AC_MSG_CHECKING(for directX headers in ${withval})
-      if test -f ${withval}/include/directx.h
+      if test -f ${withval}/include/ddraw.h
       then
         PLUGINS="${PLUGINS} directx"
         LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32"
@@ -1202,7 +1211,7 @@ dnl  win32 waveOut plugin
 dnl
 AC_ARG_ENABLE(waveout,
   [  --disable-waveout       Win32 waveOut module (default enabled on Win32)])
-if ((test "x$enableval" != "xno") && (test x$SYS = xmingw32))
+if test "x$enableval" != "xno" -a x$SYS = xmingw32
   then
     PLUGINS="${PLUGINS} waveout"
     LIB_WAVEOUT="-lwinmm"
@@ -1489,7 +1498,6 @@ AC_SUBST(ALIASES)
 AC_SUBST(INCLUDE)
 AC_SUBST(DEBUG)
 AC_SUBST(ASM)
-AC_SUBST(TRACE)
 AC_SUBST(CPROF)
 AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
@@ -1526,7 +1534,7 @@ AC_SUBST(LIB_IMDCT)
 AC_SUBST(LIB_IMDCT3DN)
 AC_SUBST(LIB_IMDCTSSE)
 AC_SUBST(LIB_KDE)
-AC_SUBST(LIB_LIBA52_ADEC)
+AC_SUBST(LIB_A52)
 AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_LIBDVDREAD)
 AC_SUBST(LIB_LIRC)
@@ -1539,6 +1547,7 @@ AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_RC)
 AC_SUBST(LIB_SDL)
+AC_SUBST(LIB_VCD)
 AC_SUBST(LIB_WAVEOUT)
 AC_SUBST(LIB_WIN32)
 AC_SUBST(LIB_X11)
@@ -1590,7 +1599,6 @@ vlc configuration
 -----------------
 vlc version           : ${VLC_VERSION}
 debug mode            : ${DEBUG}
-trace mode            : ${TRACE}
 cprof/gprof support   : ${CPROF}/${GPROF}
 need builtin getopt   : ${NEED_GETOPT}
 built-in modules      :${BUILTINS}