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

diff --git a/configure.in b/configure.in
index ff06849ab4..2666421e5a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,59 +1,112 @@
-dnl Autoconf settings for vlc
-AC_INIT(src/interface/main.c)
+dnl Autoconf settings for vlc and libdvdcss
+AC_INIT(include/common.h)
 AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.71
-AC_SUBST(VLC_VERSION)
-VLC_CODENAME=Ourumov
-AC_SUBST(VLC_CODENAME)
+HAVE_VLC=0
+if test -r src/interface/main.c; then
+  HAVE_VLC=1
+  VLC_VERSION=0.2.83
+  AC_SUBST(VLC_VERSION)
+  VLC_CODENAME=Ourumov
+  AC_SUBST(VLC_CODENAME)
+fi
+
+HAVE_LIBDVDCSS=0
+if test -r extras/libdvdcss/libdvdcss.c; then
+  HAVE_LIBDVDCSS=1
+  LIBDVDCSS_VERSION=0.0.3
+  AC_SUBST(LIBDVDCSS_VERSION)
+fi
+
+dnl Save CFLAGS and LDFLAGS
+save_CFLAGS="${CFLAGS}"
+save_LDFLAGS="${LDFLAGS}"
 
 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_FUNCS(sigrelse)
+
+dnl Check for getopt
+NEED_GETOPT=0
 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"],
-    [GETOPT=1])])
-AC_SUBST(GETOPT)
+    [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB="${LIB} -lgnugetopt"],
+    [NEED_GETOPT=1])])
 
 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
+THREAD_LIB=error
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+fi
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads")
+fi
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r")
+fi
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_FUNC(pthread_attr_init)
+  THREAD_LIB=""
+fi
+
+dnl Check for cthreads under GNU/Hurd for instance
+AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads")
+
+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)
 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 +115,58 @@ 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"
+CFLAGS="${save_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_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
  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])
+dnl Check for inline function size limit
+CFLAGS="${save_CFLAGS} -finline-limit=31337"
+AC_MSG_CHECKING([if \$CC accepts -finline-limit])
 AC_TRY_COMPILE([],,
- LCFLAGS=${LCFLAGS}" -rdynamic"
- AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+ save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
+dnl Check for Darwin plugin linking flags
+CFLAGS="${save_CFLAGS} -bundle -undefined suppress"
+AC_MSG_CHECKING([if \$CC accepts -bundle -undefined suppress])
+AC_TRY_COMPILE([],,
+ PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
+dnl Check for standard plugin linking flags
+CFLAGS="${save_CFLAGS} -shared"
+AC_MSG_CHECKING([if \$CC accepts -shared])
+AC_TRY_COMPILE([],,
+ PLCFLAGS="${PLCFLAGS} -shared"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
+dnl Check for standard soname setting
+if test x"${SOFLAGS}" = x; then
+  try_SOFLAGS="-Wl,-soname -Wl,"
+  LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+  AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0])
+  AC_TRY_LINK([],,
+   SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no))
+fi
+
+dnl Check for SunOS soname setting
+if test x"${SOFLAGS}" = x; then
+  try_SOFLAGS="-Wl,-h -Wl,"
+  LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+  AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0])
+  AC_TRY_LINK([],,
+   SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no))
+fi
 
 dnl End of the bizarre compilation tests
-CFLAGS=$save_CFLAGS
+CFLAGS="${save_CFLAGS}"
+LDFLAGS="${save_LDFLAGS}"
 
 dnl Check for boolean_t
 AC_MSG_CHECKING([for boolean_t in sys/types.h])
@@ -94,6 +179,11 @@ AC_TRY_COMPILE([#include <pthread.h>
 void quux() { boolean_t foo; }],,
  AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_MSG_CHECKING([for boolean_t in cthreads.h])
+AC_TRY_COMPILE([#include <cthreads.h>
+void quux() { boolean_t foo; }],,
+ AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -105,81 +195,171 @@ 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"
+PLUGINS="${PLUGINS}"
+
+dnl
+dnl  Accelerated modules
+dnl
+MMX_MODULES="yuvmmx idctmmx motionmmx"
+MMXEXT_MODULES="idctmmxext motionmmxext"
+THREEDNOW_MODULES="imdct3dn downmix3dn"
+SSE_MODULES="imdctsse downmixsse"
+
+AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks MMX EXT inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks 3D Now! inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("pfadd %%mm1,%%mm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks SSE inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("xorps %%xmm1,%%xmm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl
-dnl  DVD module: check for DVD ioctls
+dnl  libdvdcss: check for DVD ioctls
 dnl
+
+dnl  default is no
+CAN_BUILD_LIBDVDCSS=0
+
+dnl  for windoze
+AC_CHECK_HEADERS(winioctl.h,[
+  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
+])
+
+dnl  for Un*x and BeOS
 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)
+  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
+  AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h)
+  BSD_DVD_STRUCT=0
+  LINUX_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
+  ])
+  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.)
+    LINUX_DVD_STRUCT=1
+  ])
+  dnl
+  dnl BSDI: dvd.h
+  dnl
+  NEED_BSDI_LIBDVD=0
+  AC_EGREP_HEADER(dvd_struct,dvd.h,[
+    AC_DEFINE(DVD_STRUCT_IN_DVD_H, 1,
+              Define if <dvd.h> defines DVD_STRUCT.)
+    LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd"
+    LINUX_DVD_STRUCT=1
+  ],[
+    dnl
+    dnl BSDI: /sys/dev/scsi/scsi_ioctl.h, using our own libdvd
+    dnl
+    AC_CHECK_HEADERS(/sys/dev/scsi/scsi_ioctl.h,[
+      NEED_BSDI_LIBDVD=1
+      AC_DEFINE(DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H, 1,
+                Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT.)
+      OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
+      LINUX_DVD_STRUCT=1
+    ])
   ])
+  dnl
+  dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h
+  dnl
+  AC_CHECK_HEADER(sys/scsi/scsi_types.h,[
+    AC_CHECK_HEADER(sys/scsi/impl/uscsi.h,[
+      AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
+    ])
+  ])
+  dnl
+  dnl Final tests to check what was detected
+  dnl
+  if test x$LINUX_DVD_STRUCT = x1; then
+    AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
+              Define if Linux-like dvd_struct is defined.)
+  else
+    if test x$BSD_DVD_STRUCT = x1; then
+      AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
+                Define if BSD-like dvd_struct is defined.)
+    fi
+  fi
 ])
 
-dnl
-dnl  dummy plugin
-dnl
-AC_ARG_ENABLE(dummy,
-  [  --disable-dummy         dummy module (default enabled)])
-if test x$enable_dummy != xno; then
-  BUILTINS=${BUILTINS}"dummy "; fi
 
 dnl
-dnl  null plugin
+dnl  Check the operating system
 dnl
-AC_ARG_ENABLE(null,
-  [  --disable-null          Null module (default enabled)])
-if test x$enable_null != xno; then
-  BUILTINS=${BUILTINS}"null "; fi
+case ${host_os} in
+  bsdi*)
+    SYS=bsdi
+    ;;
+  darwin*)
+    SYS=darwin
+    ;;
+  *)
+    SYS=${host_os}
+    ;;
+esac
 
 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 ])
+  [  --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 ])
 
 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_MODULES}"; 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_MODULES}"; 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 ])
-
-dnl
-dnl  CSS DVD decryption
-dnl
-AC_ARG_ENABLE(css,
-[  --disable-css           Disable DVD CSS decryption (default enabled)],
-[ if test x$enableval = xyes; then CSS=1; else CSS=0; fi ], [ CSS=1; ])
-if test x${CSS} = x1; then AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.) fi
+#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH="${ARCH} altivec"; PLUGINS="${PLUGINS} idctaltivec"; fi ])
 
 dnl
 dnl  Debugging mode
 dnl
+DEBUG=0
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debug mode (default disabled)],
 [ if test x$enableval = xyes; then DEBUG=1; fi ])
@@ -187,10 +367,37 @@ AC_ARG_ENABLE(debug,
 dnl
 dnl  Enable/disable statistics
 dnl
+STATS=0
 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
+TRACE=0
+AC_ARG_ENABLE(trace,
+[  --enable-trace          Enable trace mode (default disabled)],
+[ if test x$enableval = xyes; then TRACE=1; fi ])
+
+dnl
+dnl  Trace mode
+dnl
+GPROF=0
+AC_ARG_ENABLE(gprof,
+[  --enable-gprof          Enable gprof profiling (default disabled)],
+[ if test x$enableval = xyes; then GPROF=1; fi ])
+
+CPROF=0
+AC_ARG_ENABLE(cprof,
+[  --enable-cprof          Enable cprof profiling (default disabled)],
+[ if test x$enableval = xyes;
+  then
+    LIB="${LIB} -lcprof"
+    CPROF=1
+  fi
+])
+
 dnl
 dnl  Enable/disable optimizations
 dnl
@@ -199,12 +406,134 @@ AC_ARG_ENABLE(optimizations,
 [ if test x$enableval = xno; then OPTIMS=0; fi ],
 [ OPTIMS=1 ])
 
-SYS=${host_os}
+dnl
+dnl  GNU portable threads
+dnl
+AC_ARG_ENABLE(pth,
+  [  --enable-pth            Enable GNU Pth support (default disabled)],
+  [ if test x$enableval = xyes; then
+    AC_CHECK_LIB(pth,pth_init)
+    AC_EGREP_HEADER(pth_init,pth.h,[
+      AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
+                Define if <pth.h> defines pth_init)
+    THREAD_LIB="-lpth"
+    fi])
+])
+
+LIB="${LIB} ${THREAD_LIB}"
+
+dnl
+dnl  DVD module: check for installed libdvdcss or local libdvdcss
+dnl
+NEED_LIBDVDCSS=0
+STATIC_LIBDVDCSS=0
+DUMMY_LIBDVDCSS=0
+AC_ARG_WITH(dvdcss,
+  [  --with-dvdcss[=name]    way to use libdvdcss, either 'yes' or 'no', or 'local-static', 'local-shared', or a path to another libdvdcss such as '/usr/local' (default 'local-static')],
+  [ case "x${withval}" in
+    xlocal-static|xyes)
+      # local libdvdcss, statically linked
+      if test x${CAN_BUILD_LIBDVDCSS} = x1
+      then
+        NEED_LIBDVDCSS=1
+        STATIC_LIBDVDCSS=1
+        BUILTINS="${BUILTINS} dvd"
+        CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
+        LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+      fi
+    ;;
+    xlocal-shared)
+      # local libdvdcss, dynamically linked
+      if test x${CAN_BUILD_LIBDVDCSS} = x1
+      then
+        NEED_LIBDVDCSS=1
+        BUILTINS="${BUILTINS} dvd"
+        CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
+        LIB_DVD="${LIB_DVD} -Llib -ldvdcss"
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
+      fi
+    ;;
+    xno)
+      # don't use libdvdcss at all, build a DVD module that can dlopen() it
+      DUMMY_LIBDVDCSS=1
+      BUILTINS="${BUILTINS} dvd"
+      OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+      CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+      CFLAGS_DVD="${CFLAGS_DVD} -DLIBDVDCSS_VERSION=\"${LIBDVDCSS_VERSION}\""
+      LIB_DVD="${LIB_DVD} -ldl"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
+    ;;
+    *)
+      # existing libdvdcss
+      BUILTINS="${BUILTINS} dvd"
+      if test "x$withval" != "xyes"
+      then
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L"$withval"/lib"
+        CFLAGS_DVD="${CFLAGS_DVD} -I"$withval"/include"
+      fi
+      LIB_DVD="${LIB_DVD} -ldvdcss"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss"
+    esac ],
+  # user didn't decide, we choose to use local libdvdcss and link statically
+  # if libdvdcss is in the archive, or to use the dummy replacement otherwise.
+  [ if test x${CAN_BUILD_LIBDVDCSS} = x1
+    then
+      NEED_LIBDVDCSS=1
+      STATIC_LIBDVDCSS=1
+      BUILTINS="${BUILTINS} dvd"
+      CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
+      LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+    else
+      # XXX: no check for libdl is done, don't try this at home !
+      DUMMY_LIBDVDCSS=1
+      BUILTINS="${BUILTINS} dvd"
+      OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+      CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+      LIB_DVD="${LIB_DVD} -ldl"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
+    fi ])
+
+dnl
+dnl  dummy plugin
+dnl
+AC_ARG_ENABLE(dummy,
+  [  --disable-dummy         dummy module (default enabled)])
+
+if test x$enable_dummy != xno
+then
+  BUILTINS="${BUILTINS} dummy"
+fi
+
+dnl
+dnl  null plugin
+dnl
+AC_ARG_ENABLE(null,
+  [  --disable-null          Null module (default enabled)])
+
+if test x$enable_null != xno
+then
+  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 special case for BeOS
-if test x$host_os = xbeos; then
-    BUILTINS=${BUILTINS}"beos "
+if test x$SYS = xbeos
+then
+    BUILTINS="${BUILTINS} beos"
     LIB_BEOS="-lbe -lgame -lroot -ltracker"
+    PLCFLAGS="${PLCFLAGS} -nostart"
 
 dnl default case
 else
@@ -214,9 +543,12 @@ dnl  OSS /dev/dsp module
 dnl
 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 "
+
+if test x$enable_dsp != xno
+then
+  if test -c /dev/dsp
+  then
+    PLUGINS="${PLUGINS} dsp"
   fi
 fi
 
@@ -225,9 +557,14 @@ dnl  Esound module
 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`"
+  [if test x$enable_esd = xyes
+   then
+     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 +573,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])
 
@@ -245,35 +582,52 @@ dnl  MacOS X module
 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 "
+  [if test x$enable_macosx = xyes
+   then
+     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
+dnl  QNX RTOS module
+dnl
+AC_ARG_ENABLE(qnx,
+  [  --disable-qnx           QNX RTOS support (default enabled in QNX RTOS)])
+    if test x$enable_qnx != xno
+    then
+      AC_CHECK_HEADERS(Ph.h, [
+        PLUGINS="${PLUGINS} qnx"
+        LIB_QNX="-lasound -lph"
+      ])
+    fi
+
 dnl
 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
 dnl
 AC_ARG_WITH(ggi,
   [  --with-ggi[=name]       GGI support (default disabled)],
-  [ if test "x$withval" != "xno";
+  [ if test "x$withval" != "xno"
     then
-      PLUGINS=${PLUGINS}"ggi ";
-      if test "x$withval" != "xyes";
+      PLUGINS="${PLUGINS} ggi"
+      if test "x$withval" != "xyes"
       then
         LIB_GGI="-l"$withval
       else
@@ -284,25 +638,81 @@ AC_ARG_WITH(ggi,
 dnl
 dnl  SDL module
 dnl
-AC_ARG_WITH(sdl,
-  [  --with-sdl[=name]       SDL support (default enabled)],
-  [ if test "x$withval" != "xno";
+AC_ARG_ENABLE(sdl,
+  [  --disable-sdl           SDL support (default enabled)])
+if test "x$enable_sdl" != "xno"
+then
+  SDL_PATH=$PATH
+  AC_ARG_WITH(sdl-config-path,
+    [  --with-sdl-config-path=path sdl-config path (default search in \$PATH)],
+    [ if test "x$withval" != "xno"
+      then
+        SDL_PATH=$withval:$PATH
+      fi ])
+  AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, $SDL_PATH)
+  SDL_CONFIG=${SDL12_CONFIG}
+  SDL_HEADER="SDL12/SDL.h"
+  if test x${SDL_CONFIG} = xno
+  then
+    AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, $SDL_PATH)
+    SDL_CONFIG=${SDL11_CONFIG}
+    SDL_HEADER="SDL11/SDL.h"
+  fi
+  if test x${SDL_CONFIG} = xno
+  then
+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, $SDL_PATH)
+    SDL_HEADER="SDL/SDL.h"
+  fi
+  if test x${SDL_CONFIG} != xno
+  then
+    PLUGINS="${PLUGINS} sdl"
+    CFLAGS_SDL="`${SDL_CONFIG} --cflags`"
+    LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
+    save_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $CFLAGS_SDL"
+    AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
+      <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),
+      [ echo "The development package for SDL is not installed. Please install it"
+        echo "and try again. Alternatively you can also configure with --disable-sdl."
+        exit 1 ])
+    CFLAGS=$save_CFLAGS
+    if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
+    then
+      echo "You need SDL version 1.1.5 or later. Install it and try again."
+      echo "Alternatively, you can also configure with --disable-sdl."
+      exit 1
+    fi
+  elif test "x$enable_sdl" =  "xyes"
+  then
+    echo "I couldn't find the SDL package. You can download libSDL from"
+    echo "http://www.libsdl.org/, or configure with --disable-sdl. Have a"
+    echo "nice day."
+    exit 1
+  fi
+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}"sdl ";
-      if test "x$withval" != "xyes";
+      PLUGINS="${PLUGINS} directx"
+      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_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
+        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"
+        AC_CHECK_HEADERS(directx.h, , [echo "Cannot find DirectX headers !"; exit])
+        LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"
       fi
     fi ])
-    if test "x$withval" = "x";
+    if test "x$withval" = "x"
     then
-      AC_CHECK_HEADERS(SDL/SDL.h,
-      [PLUGINS=${PLUGINS}"sdl "
-       LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL"])
+      AC_CHECK_HEADERS(directx.h,
+      [PLUGINS="${PLUGINS} directx"
+       LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"])
     fi
 
 dnl
@@ -310,14 +720,14 @@ dnl  Glide module
 dnl
 AC_ARG_WITH(glide,
   [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
-  [ if test "x$withval" != "xno";
+  [ if test "x$withval" != "xno"
     then
-      PLUGINS=${PLUGINS}"glide ";
-      if test "x$withval" != "xyes";
+      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 +737,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 +747,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 +763,17 @@ 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"
+     LIB_KDE="-L${KDEDIR}/lib -lkfile"
+     if test -x ${QTDIR}/bin/moc
+     then
+       MOC=${QTDIR}/bin/moc
+     else
+       MOC=moc
+     fi
+   fi])
 
 dnl
 dnl  Gnome module
@@ -355,8 +781,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])
 
@@ -365,12 +791,23 @@ dnl  Gtk+ module
 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,,'`"
+if test x$enable_gtk != xno
+then
+  # look for gtk-config
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  if test -x ${GTK_CONFIG}
+  then
+    CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`"
+    LIB_GTK="`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
   fi
+  # now look for the gtk.h header
+  saved_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
+  AC_CHECK_HEADERS(gtk/gtk.h, [
+    PLUGINS="${PLUGINS} gtk"
+    ALIASES="${ALIASES} gvlc"
+  ])
+  CPPFLAGS=$saved_CPPFLAGS
 fi
 
 dnl
@@ -379,31 +816,58 @@ 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 "
-     LIB_ALSA="-lasound"
-   fi; fi])
+  [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])
 
 dnl  end of non-BeOS stuff
 fi
@@ -416,49 +880,109 @@ 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(ASM)
+AC_SUBST(TRACE)
+AC_SUBST(CPROF)
+AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
-AC_SUBST(CSS)
+AC_SUBST(NEED_GETOPT)
+AC_SUBST(MOC)
+AC_SUBST(WINDRES)
 
 AC_SUBST(LCFLAGS)
-AC_SUBST(LIB)
+AC_SUBST(PLCFLAGS)
+AC_SUBST(SOFLAGS)
 
+AC_SUBST(LIB)
 AC_SUBST(LIB_ALSA)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
+AC_SUBST(LIB_DVD)
+AC_SUBST(LIB_DVD_PLUGIN)
 AC_SUBST(LIB_ESD)
 AC_SUBST(LIB_GGI)
 AC_SUBST(LIB_GLIDE)
 AC_SUBST(LIB_GNOME)
 AC_SUBST(LIB_GTK)
 AC_SUBST(LIB_IDCTALTIVEC)
+AC_SUBST(LIB_LIBDVDCSS)
+AC_SUBST(LIB_KDE)
 AC_SUBST(LIB_MACOSX)
+AC_SUBST(LIB_QNX)
 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_DVD)
+AC_SUBST(CFLAGS_LIBDVDCSS)
+AC_SUBST(CFLAGS_GTK)
+AC_SUBST(CFLAGS_SDL)
+AC_SUBST(CFLAGS_X11)
+
+AC_SUBST(OBJ_DVD)
+AC_SUBST(OBJ_LIBDVDCSS)
+
+AC_SUBST(NEED_LIBDVDCSS)
+
+AC_OUTPUT([Makefile.opts include/config.h])
 
 echo "
+global configuration
+--------------------
+system                : ${SYS}
+architecture          : ${ARCH}
+optimizations         : ${OPTIMS}"
+
+if test x${HAVE_VLC} = x1
+then
+  echo "
 vlc configuration
 -----------------
 vlc version           : ${VLC_VERSION}
-system                : ${SYS}
-architecture          : ${ARCH}
 debug mode            : ${DEBUG}
 statistics            : ${STATS}
-optimizations         : ${OPTIMS}
-CSS decryption        : ${CSS}
-need builtin getopt   : ${GETOPT}
-plugin modules        : ${PLUGINS}
-built-in modules      : ${BUILTINS}
-vlc aliases           : ${ALIASES}
-
-You may now tune Makefile.opts at your convenience."
+trace mode            : ${TRACE}
+cprof/gprof support   : ${CPROF}/${GPROF}
+need builtin getopt   : ${NEED_GETOPT}
+built-in modules      :${BUILTINS}
+plugin modules        :${PLUGINS}
+vlc aliases           :${ALIASES}"
+fi
+
+echo "
+libdvdcss configuration
+-----------------------
+can be built          : ${CAN_BUILD_LIBDVDCSS}
+will be built         : ${NEED_LIBDVDCSS}"
+if test x${NEED_LIBDVDCSS} = x1
+then
+  echo "need BSDI libdvd      : ${NEED_BSDI_LIBDVD}"
+  echo "link statically       : ${STATIC_LIBDVDCSS}"
+else
+  echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
+fi
+
+echo "
+You may now tune Makefile.opts at your convenience, for instance to choose
+which modules get compiled as plugins.
+"
+if test x${HAVE_VLC} = x1
+then
+  echo "To build vlc and its plugins, type \`make vlc'."
+fi
+if test x${HAVE_LIBDVDCSS} = x1
+then
+  echo "To build libdvdcss only, type \`make libdvdcss'."
+fi
+echo ""