X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=af464d68e06cb75db0dfae1852650923083e810d;hb=945f294626b776bbabadc5627c05456a6ff0ae2b;hp=ff06849ab4d7e89f71d442fe7b6e39e38544dd98;hpb=79a45f72ac0e4bda8f2796bf7ffed7ef7fc7f3f8;p=vlc

diff --git a/configure.in b/configure.in
index ff06849ab4..af464d68e0 100644
--- a/configure.in
+++ b/configure.in
@@ -4,56 +4,95 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.71
+VLC_VERSION=0.2.73
 AC_SUBST(VLC_VERSION)
 VLC_CODENAME=Ourumov
 AC_SUBST(VLC_CODENAME)
 
+dnl Save CFLAGS
+save_CFLAGS="${CFLAGS}"
+
 dnl Check for tools
 AC_PROG_MAKE_SET
-if test -z "$CC"; then
-  AC_PROG_CC
-fi
-if test -z "$CPP"; then
-  AC_PROG_CPP
-fi
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_RANLIB
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
 dnl Check for compiler environment
 AC_C_CONST
-AC_C_BIGENDIAN
+
+dnl Check for endianness if not cross-compiling
+if test x${cross_compiling} != xyes; then
+  AC_C_BIGENDIAN
+fi
 
 dnl Check for system libs needed
 AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol)
 AC_CHECK_FUNCS(setenv putenv)
-AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect,LIB=${LIB}" -lsocket")])
-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,LIB=${LIB}" -lnsl")])
-AC_CHECK_FUNC(nanosleep,,[AC_CHECK_LIB(rt,nanosleep,LIB=${LIB}" -lrt",[AC_CHECK_LIB(posix4,nanosleep,LIB=${LIB}" -lposix4")])])
+AC_CHECK_FUNC(connect,,[
+  AC_CHECK_LIB(socket,connect,LIB="${LIB} -lsocket")
+])
+AC_CHECK_FUNC(gethostbyname,,[
+  AC_CHECK_LIB(nsl,gethostbyname,LIB="${LIB} -lnsl")
+])
+AC_CHECK_FUNC(nanosleep,,[
+  AC_CHECK_LIB(rt,nanosleep,LIB="${LIB} -lrt",[
+    AC_CHECK_LIB(posix4,nanosleep,LIB="${LIB} -lposix4")
+  ])
+])
 AC_CHECK_FUNCS(usleep)
-AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton,LIB=${LIB}" -lresolv")])
+AC_CHECK_FUNC(inet_aton,,[
+  AC_CHECK_LIB(resolv,inet_aton,LIB="${LIB} -lresolv")
+])
 AC_CHECK_FUNCS(vasprintf)
+AC_CHECK_FUNCS(swab)
 
 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
 [ # FreeBSD has a gnugetopt library for this:
   AC_CHECK_LIB([gnugetopt],[getopt_long],
-    [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB=${LIB}" -lgnugetopt"],
+    [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB="${LIB} -lgnugetopt"],
     [GETOPT=1])])
 AC_SUBST(GETOPT)
 
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
-AC_CHECK_LIB(dl,dlopen,LIB=${LIB}" -ldl")
-AC_CHECK_LIB(m,pow,LIB_YUV=${LIB_YUV}" -lm")
-AC_CHECK_LIB(pthread,pthread_create,LIB=${LIB}" -lpthread")
-AC_CHECK_LIB(threads,thread_create,LIB=${LIB}" -lthreads")
+AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
+AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm")
 
 CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-AC_CHECK_HEADERS(stddef.h)
-AC_CHECK_HEADERS(getopt.h)
-AC_CHECK_HEADERS(sys/sockio.h)
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
+CFLAGS="${CFLAGS} -I/usr/local/include"
+
+dnl Check for pthreads - borrowed from XMMS
+PTHREAD_LIBS=error
+AC_CHECK_LIB(pthread,pthread_attr_init,PTHREAD_LIBS="-lpthread")
+if test "x${PTHREAD_LIBS}" = xerror; then
+  AC_CHECK_LIB(pthreads,pthread_attr_init,PTHREAD_LIBS="-lpthreads")
+fi
+if test "x${PTHREAD_LIBS}" = xerror; then
+  AC_CHECK_LIB(c_r,pthread_attr_init,PTHREAD_LIBS="-lc_r")
+fi
+if test "x${PTHREAD_LIBS}" = xerror; then
+  PTHREAD_LIBS=""
+  AC_CHECK_FUNC(pthread_attr_init)
+fi
+LIB="${LIB} ${PTHREAD_LIBS}"
+
+dnl Check for misc headers
+AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
+  AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
+            Define if <pthread.h> defines pthread_cond_t.)
+])
+AC_EGREP_HEADER(strncasecmp,strings.h,[
+  AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1,
+            Define if <strings.h> defines strncasecmp.)
+])
+
+dnl Check for headers
+AC_CHECK_HEADERS(stddef.h getopt.h strings.h)
+AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h unistd.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)
@@ -62,26 +101,16 @@ AC_CHECK_HEADERS(machine/param.h)
 dnl Check for threads library
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
 
-dnl Do a series of bizarre compilation tests
-save_CFLAGS=$CFLAGS
-
 dnl Check for ntohl, etc.
 CFLAGS="${CFLAGS} -Wall -Werror"
 AC_MSG_CHECKING([for ntohl in sys/param.h])
 AC_TRY_COMPILE([#include <sys/param.h>
 void foo() { int meuh; ntohl(meuh); }],,
- AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if ntohl is in <sys/param.h>.)
- AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-
-dnl Check for -rdynamic flag
-CFLAGS="${CFLAGS} -rdynamic -Wall -Werror"
-AC_MSG_CHECKING([if \$CC accepts -rdynamic])
-AC_TRY_COMPILE([],,
- LCFLAGS=${LCFLAGS}" -rdynamic"
+ AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl End of the bizarre compilation tests
-CFLAGS=$save_CFLAGS
+CFLAGS="${save_CFLAGS}"
 
 dnl Check for boolean_t
 AC_MSG_CHECKING([for boolean_t in sys/types.h])
@@ -105,22 +134,65 @@ ARCH=${host_cpu}
 dnl
 dnl  default modules
 dnl
-#PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
-BUILTINS=${BUILTINS}"ps ts yuv idct idctclassic motion "
-if test x$host_os = xbeos; then
-    ACCEL_PLUGINS="yuvmmx idctmmx motionmmx "
-else
-    ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext "
-fi
+BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix"
+
+dnl
+dnl  Accelerated modules
+dnl
+case x$host_os in
+  xmingw32msvc)
+    MMX_PLUGINS="idctmmx motionmmx"
+    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn"
+    ;;
+  *)
+    MMX_PLUGINS="yuvmmx idctmmx motionmmx"
+    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
+    ;;
+esac
+
+AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
+  ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMX_PLUGINS}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks MMX EXT or SSE inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
+  ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMXEXT_PLUGINS}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl
 dnl  DVD module: check for DVD ioctls
 dnl
 AC_CHECK_HEADERS(sys/ioctl.h,[
-  BUILTINS=${BUILTINS}"dvd "
-  AC_CHECK_HEADERS(linux/cdrom.h)
-  AC_EGREP_HEADER(dvd,linux/cdrom.h,[
-    AC_DEFINE(LINUX_DVD,1, DVD support for linux)
+  BUILTINS="${BUILTINS} dvd"
+  AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h)
+  BSD_DVD_STRUCT=0
+  dnl
+  dnl Old FreeBSD: sys/cdio.h
+  dnl
+  AC_EGREP_HEADER(dvd_struct,sys/dvdio.h,[
+    AC_DEFINE(DVD_STRUCT_IN_SYS_DVDIO_H, 1,
+              Define if <sys/dvdio.h> defines dvd_struct.)
+    BSD_DVD_STRUCT=1
+  ])
+  dnl
+  dnl Newer FreeBSD: sys/dvdio.h
+  dnl
+  AC_EGREP_HEADER(dvd_struct,sys/cdio.h,[
+    AC_DEFINE(DVD_STRUCT_IN_SYS_CDIO_H, 1,
+              Define if <sys/cdio.h> defines dvd_struct.)
+    BSD_DVD_STRUCT=1
+  ])
+  if test x$BSD_DVD_STRUCT = x1; then
+    AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
+              Define if BSD-like dvd_struct is defined.)
+  fi
+  dnl
+  dnl Linux: linux/cdrom.h
+  dnl
+  AC_EGREP_HEADER(dvd_struct,linux/cdrom.h,[
+    AC_DEFINE(DVD_STRUCT_IN_LINUX_CDROM_H, 1,
+              Define if <linux/cdrom.h> defines DVD_STRUCT.)
   ])
 ])
 
@@ -130,7 +202,7 @@ dnl
 AC_ARG_ENABLE(dummy,
   [  --disable-dummy         dummy module (default enabled)])
 if test x$enable_dummy != xno; then
-  BUILTINS=${BUILTINS}"dummy "; fi
+  BUILTINS="${BUILTINS} dummy"; fi
 
 dnl
 dnl  null plugin
@@ -138,36 +210,44 @@ dnl
 AC_ARG_ENABLE(null,
   [  --disable-null          Null module (default enabled)])
 if test x$enable_null != xno; then
-  BUILTINS=${BUILTINS}"null "; fi
+  BUILTINS="${BUILTINS} null"; fi
+
+dnl
+dnl  rc plugin
+dnl
+AC_ARG_ENABLE(rc,
+  [  --disable-rc            rc module (default enabled)])
+if test x$enable_rc != xno; then
+  BUILTINS="${BUILTINS} rc"; fi
 
 dnl
 dnl  PentiumPro acceleration
 dnl
 AC_ARG_ENABLE(ppro,
 [  --disable-ppro          Disable PentiumPro optimizations (default enabled for x86)],
-[ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ],
-[ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ])
+[ if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi ],
+[ if test x${host_cpu} = xi686; then ARCH="${ARCH} ppro"; fi ])
 
 dnl
 dnl  MMX acceleration
 dnl
 AC_ARG_ENABLE(mmx,
 [  --disable-mmx           Disable MMX optimizations (default enabled for x86)],
-[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx";
-  BUILTINS=${BUILTINS}}${ACCEL_PLUGINS}; fi ],
-[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx";
-  BUILTINS=${BUILTINS}${ACCEL_PLUGINS}; fi ])
+[ if test x$enableval = xyes; then ARCH="${ARCH} mmx";
+  BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi ],
+[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86 -o x${host_cpu} = xi386; then ARCH="${ARCH} mmx";
+  BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi ])
 
 dnl
 dnl  AltiVec acceleration
 dnl
 AC_ARG_ENABLE(altivec,
 [  --enable-altivec        Enable altivec optimizations (default disabled since it is broken)],
-[ if test x$enableval = xyes; then ARCH=${ARCH}" altivec";
-    BUILTINS=${BUILTINS}"idctaltivec "
+[ if test x$enableval = xyes; then ARCH="${ARCH} altivec";
+    BUILTINS="${BUILTINS} idctaltivec"
     LIB_IDCTALTIVEC="-framework vecLib"
   fi ])
-#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ])
+#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH="${ARCH} altivec"; PLUGINS="${PLUGINS} idctaltivec"; fi ])
 
 dnl
 dnl  CSS DVD decryption
@@ -191,6 +271,13 @@ AC_ARG_ENABLE(stats,
 [  --enable-stats          Enable printing of statistics (default disabled)],
 [ if test x$enableval = xyes; then STATS=1; fi ])
 
+dnl
+dnl  Trace mode
+dnl
+AC_ARG_ENABLE(trace,
+[  --enable-trace          Enable trace mode (default disabled)],
+[ if test x$enableval = xyes; then TRACE=1; fi ])
+
 dnl
 dnl  Enable/disable optimizations
 dnl
@@ -203,7 +290,7 @@ SYS=${host_os}
 
 dnl special case for BeOS
 if test x$host_os = xbeos; then
-    BUILTINS=${BUILTINS}"beos "
+    BUILTINS="${BUILTINS} beos"
     LIB_BEOS="-lbe -lgame -lroot -ltracker"
 
 dnl default case
@@ -216,7 +303,7 @@ AC_ARG_ENABLE(dsp,
   [  --disable-dsp           Linux /dev/dsp support (default enabled)])
 if test x$enable_dsp != xno; then
   if test -c /dev/dsp; then
-    PLUGINS=${PLUGINS}"dsp "
+    PLUGINS="${PLUGINS} dsp"
   fi
 fi
 
@@ -226,8 +313,11 @@ dnl
 AC_ARG_ENABLE(esd,
   [  --enable-esd            Esound library support (default disabled)],
   [if test x$enable_esd = xyes; then
-     PLUGINS=${PLUGINS}"esd "
-     LIB_ESD="`esd-config --libs`"
+     AC_PATH_PROG(ESD_CONFIG, esd-config, no)
+     if test x${ESD_CONFIG} != xno; then
+       PLUGINS="${PLUGINS} esd"
+       LIB_ESD="`${ESD_CONFIG} --libs`"
+     fi
    fi])
 
 dnl
@@ -236,7 +326,7 @@ dnl
 AC_ARG_ENABLE(darwin,
   [  --enable-darwin         Darwin sound support (default disabled)],
   [if test x$enable_darwin = xyes; then
-     PLUGINS=${PLUGINS}"darwin "
+     PLUGINS="${PLUGINS} darwin"
      LIB_DARWIN="-framework CoreAudio"
    fi])
 
@@ -246,16 +336,16 @@ dnl
 AC_ARG_ENABLE(macosx,
   [  --enable-macosx         Mac OS X interface support (default enabled in Mac OS X)],
   [if test x$enable_macosx = xyes; then
-     BUILTINS=${BUILTINS}"macosx "
+     BUILTINS="${BUILTINS} macosx"
      LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
-     LIB_TS=${LIB_TS}" -framework AGL -framework Carbon"
-     LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon"
+     LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
+     LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
    fi],
   [AC_CHECK_HEADERS(Carbon/Carbon.h,
-     BUILTINS=${BUILTINS}"macosx "
+     BUILTINS="${BUILTINS} macosx"
      LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
-     LIB_TS=${LIB_TS}" -framework AGL -framework Carbon"
-     LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon"
+     LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
+     LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
    )])
 
 dnl
@@ -263,7 +353,7 @@ dnl  Linux framebuffer module
 dnl
 AC_ARG_ENABLE(fb,
   [  --enable-fb             Linux framebuffer support (default disabled)],
-  [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi])
+  [if test x$enable_fb = xyes; then PLUGINS="${PLUGINS} fb"; fi])
 
 dnl
 dnl  GGI module
@@ -272,7 +362,7 @@ AC_ARG_WITH(ggi,
   [  --with-ggi[=name]       GGI support (default disabled)],
   [ if test "x$withval" != "xno";
     then
-      PLUGINS=${PLUGINS}"ggi ";
+      PLUGINS="${PLUGINS} ggi";
       if test "x$withval" != "xyes";
       then
         LIB_GGI="-l"$withval
@@ -288,21 +378,45 @@ AC_ARG_WITH(sdl,
   [  --with-sdl[=name]       SDL support (default enabled)],
   [ if test "x$withval" != "xno";
     then
-      PLUGINS=${PLUGINS}"sdl ";
+      PLUGINS="${PLUGINS} sdl";
       if test "x$withval" != "xyes";
       then
-        LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -L"$withval"/lib -l"$withval
-        INCLUDE=${INCLUDE}" -I"$withval"/include"
+        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -lSDL"
+        INCLUDE="${INCLUDE} -I"$withval"/include"
       else
         AC_CHECK_HEADERS(SDL/SDL.h, , [echo "Cannot find SDL headers !"; exit])
-        LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL"
+        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"
       fi
     fi ])
     if test "x$withval" = "x";
     then
       AC_CHECK_HEADERS(SDL/SDL.h,
-      [PLUGINS=${PLUGINS}"sdl "
-       LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL"])
+      [PLUGINS="${PLUGINS} sdl"
+       LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"])
+    fi
+
+dnl
+dnl  Windows DirectX module
+dnl
+AC_ARG_WITH(directx,
+  [  --with-directx[=name]   Windows DirectX support (default enabled)],
+  [ if test "x$withval" != "xno";
+    then
+      PLUGINS="${PLUGINS} directx";
+      if test "x$withval" != "xyes";
+      then
+        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lddraw -ldsound"
+        INCLUDE="${INCLUDE} -I"$withval"/include"
+      else
+        AC_CHECK_HEADERS(directx.h, , [echo "Cannot find DirectX headers !"; exit])
+        LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lddraw -ldsound"
+      fi
+    fi ])
+    if test "x$withval" = "x";
+    then
+      AC_CHECK_HEADERS(directx.h,
+      [PLUGINS="${PLUGINS} directx"
+       LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lddraw -ldsound"])
     fi
 
 dnl
@@ -312,12 +426,12 @@ AC_ARG_WITH(glide,
   [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
   [ if test "x$withval" != "xno";
     then
-      PLUGINS=${PLUGINS}"glide ";
+      PLUGINS="${PLUGINS} glide";
       if test "x$withval" != "xyes";
       then
-        LIB_GLIDE="-l"$withval
+        LIB_GLIDE="-l"$withval" -lm"
       else
-        LIB_GLIDE="-lglide2x"
+        LIB_GLIDE="-lglide2x -lm"
       fi
     fi ])
 
@@ -327,7 +441,7 @@ dnl
 AC_ARG_ENABLE(ncurses,
   [  --enable-ncurses        ncurses interface support (default disabled)],
   [if test x$enable_ncurses = xyes; then
-     PLUGINS=${PLUGINS}"ncurses "
+     PLUGINS="${PLUGINS} ncurses"
      LIB_NCURSES="-lncurses"
    fi])
 
@@ -337,9 +451,15 @@ dnl
 AC_ARG_ENABLE(qt,
   [  --enable-qt             Qt interface support (default disabled)],
   [if test x$enable_qt = xyes; then
-     PLUGINS=${PLUGINS}"qt "
-     ALIASES=${ALIASES}"qvlc "
+     PLUGINS="${PLUGINS} qt"
+     ALIASES="${ALIASES} qvlc"
      LIB_QT="-lqt -L${QTDIR}/lib"
+     if test -x ${QTDIR}/bin/moc ;
+     then
+       MOC=${QTDIR}/bin/moc
+     else
+       MOC=moc
+     fi
    fi])
 
 dnl 
@@ -347,7 +467,7 @@ dnl  KDE module
 dnl
 AC_ARG_ENABLE(kde,
   [  --enable-kde            KDE interface support (default disabled)],
-  [if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi])
+  [if test x$enable_kde = xyes; then PLUGINS="${PLUGINS} kde"; ALIASES="${ALIASES} kvlc"; fi])
 
 dnl
 dnl  Gnome module
@@ -355,8 +475,8 @@ dnl
 AC_ARG_ENABLE(gnome,
   [  --enable-gnome          Gnome interface support (default disabled)],
   [if test x$enable_gnome = xyes; then
-     PLUGINS=${PLUGINS}"gnome "
-     ALIASES=${ALIASES}"gnome-vlc "
+     PLUGINS="${PLUGINS} gnome"
+     ALIASES="${ALIASES} gnome-vlc"
      LIB_GNOME="`gnome-config --libs gnomeui | sed 's,-rdynamic,,'`"
    fi])
 
@@ -366,10 +486,12 @@ dnl
 AC_ARG_ENABLE(gtk,
   [  --disable-gtk           Gtk+ support (default enabled)])
 if test x$enable_gtk != xno; then
-  if which gtk-config; then
-    PLUGINS=${PLUGINS}"gtk "
-    ALIASES=${ALIASES}"gvlc "
-    LIB_GTK="`gtk-config --libs gtk | sed 's,-rdynamic,,'`"
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  if test x${GTK_CONFIG} != xno; then
+    PLUGINS="${PLUGINS} gtk"
+    ALIASES="${ALIASES} gvlc"
+    CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`"
+    LIB_GTK="`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
   fi
 fi
 
@@ -379,29 +501,51 @@ dnl
 AC_ARG_ENABLE(x11,
   [  --disable-x11           X11 support (default enabled)])
 if test x$enable_x11 != xno; then
+  if test x$x_includes = xNONE; then
+    x_includes=/usr/X11R6/include
+  fi
+  if test x$x_libraries = xNONE; then
+    x_libraries=/usr/X11R6/lib
+  fi
+  saved_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS -I$x_includes"
   AC_CHECK_HEADERS(X11/Xlib.h, [
-    PLUGINS=${PLUGINS}"x11 "
-    LIB_X11="-L/usr/X11R6/lib -lX11 -lXext"
-  ])
+    PLUGINS="${PLUGINS} x11"
+    LIB_X11="-L$x_libraries -lX11 -lXext"
+    CFLAGS_X11="-I$x_includes"
+  ]
+  CPPFLAGS=$saved_CPPFLAGS)
 fi
 
 dnl
 dnl  XVideo module
 dnl
 AC_ARG_ENABLE(xvideo,
-  [  --enable-xvideo         XVideo interface support (default disabled)],
-  [if test x$enable_xvideo = xyes; then
-     PLUGINS=${PLUGINS}"xvideo "
-     LIB_XVIDEO="-L/usr/X11R6/lib -lX11 -lXext"
-   fi])
+  [  --disable-xvideo        XVideo support (default enabled)])
+if test x$enable_xvideo != xno; then
+  if test x$x_includes = xNONE; then
+    x_includes=/usr/X11R6/include
+  fi
+  if test x$x_libraries = xNONE; then
+    x_libraries=/usr/X11R6/lib
+  fi
+  saved_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS -I$x_includes"
+  AC_CHECK_HEADERS(X11/extensions/Xv.h, [
+    PLUGINS="${PLUGINS} xvideo"
+    LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
+    CFLAGS_X11="-I$x_includes"
+  ]
+  CPPFLAGS=$saved_CPPFLAGS)
+fi
 
 dnl
 dnl  ALSA module
 dnl
 AC_ARG_ENABLE(alsa,
   [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
-  [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then
-     PLUGINS=${PLUGINS}"alsa "
+  [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test x$have_alsa = xtrue; then
+     PLUGINS="${PLUGINS} alsa"
      LIB_ALSA="-lasound"
    fi; fi])
 
@@ -416,11 +560,14 @@ AC_SUBST(ARCH)
 AC_SUBST(PLUGINS)
 AC_SUBST(BUILTINS)
 AC_SUBST(ALIASES)
+AC_SUBST(DEFINE)
 AC_SUBST(INCLUDE)
 AC_SUBST(DEBUG)
 AC_SUBST(STATS)
+AC_SUBST(TRACE)
 AC_SUBST(OPTIMS)
 AC_SUBST(CSS)
+AC_SUBST(MOC)
 
 AC_SUBST(LCFLAGS)
 AC_SUBST(LIB)
@@ -439,11 +586,16 @@ AC_SUBST(LIB_NCURSES)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_TS)
 AC_SUBST(LIB_SDL)
+AC_SUBST(LIB_DIRECTX)
 AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)
 
-AC_OUTPUT([Makefile.opts Makefile.modules include/config.h])
+AC_SUBST(CFLAGS_VLC)
+AC_SUBST(CFLAGS_GTK)
+AC_SUBST(CFLAGS_X11)
+
+AC_OUTPUT([Makefile.opts include/config.h])
 
 echo "
 vlc configuration
@@ -453,12 +605,13 @@ system                : ${SYS}
 architecture          : ${ARCH}
 debug mode            : ${DEBUG}
 statistics            : ${STATS}
+trace mode            : ${TRACE}
 optimizations         : ${OPTIMS}
 CSS decryption        : ${CSS}
 need builtin getopt   : ${GETOPT}
-plugin modules        : ${PLUGINS}
-built-in modules      : ${BUILTINS}
-vlc aliases           : ${ALIASES}
+built-in modules      :${BUILTINS}
+plugin modules        :${PLUGINS}
+vlc aliases           :${ALIASES}
 
 You may now tune Makefile.opts at your convenience."