]> git.sesse.net Git - vlc/blobdiff - configure.in
* (very old) russian translation courtesy of Valek Filippov <frob@df.ru>.
[vlc] / configure.in
index f4a7e388bc69d685a5397612f99dc32b4fdca981..b0f0641db86d1131509670281d73466f936c4f37 100644 (file)
-dnl Autoconf settings for vlc
-AC_INIT(include/main.h)
+dnl Autoconf settings for vlc and libdvdcss
+AC_INIT(include/common.h)
 AC_CONFIG_HEADER(include/defs.h)
 
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
-VLC_VERSION=0.2.80
-AC_SUBST(VLC_VERSION)
-LIBDVDCSS_VERSION=0.0.1
-AC_SUBST(LIBDVDCSS_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.92-dev"
+  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="1.0.1-dev"
+  AC_SUBST(LIBDVDCSS_VERSION)
+  if test -r extras/libdvdcss/csskeys.h; then
+    AC_DEFINE(HAVE_CSSKEYS,1,css decryption with player keys)
+  fi
+fi
 
-dnl Save CFLAGS
+dnl Save CFLAGS and LDFLAGS
 save_CFLAGS="${CFLAGS}"
+save_LDFLAGS="${LDFLAGS}"
 
 dnl Check for tools
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_RANLIB
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+
+dnl Gettext stuff
+ALL_LINGUAS="de fr ru"
+PACKAGE="vlc"
+VERSION="$VLC_VERSION"
+
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AM_GNU_GETTEXT
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
-dnl Check for compiler environment
-AC_C_CONST
-
-dnl Check for endianness if not cross-compiling
+dnl
+dnl  Endianness check, with a special test for cross-compilation
+dnl
 if test x${cross_compiling} != xyes; then
   AC_C_BIGENDIAN
+else
+  dnl  We are crosscompiling, give the user the opportunity to specify
+  dnl  --with-words=big or --with-words=little ; otherwise, try to guess
+  AC_ARG_WITH(words,
+    [  --with-words=endianness Set endianness (big or little)])
+  case "x$withval" in
+    xbig)
+      ac_cv_c_bigendian=yes
+      ;;
+    xlittle)
+      ac_cv_c_bigendian=no
+      ;;
+    *)
+      dnl  Try to guess endianness by matching patterns on a compiled
+      dnl  binary, by looking for an ASCII or EBCDIC string
+      ac_cv_c_bigendian=unknown
+      AC_MSG_CHECKING(what the byte order looks to be)[
+        cat >conftest.c <<EOF
+        short am[] = { 0x4249, 0x4765, 0x6e44, 0x6961, 0x6e53, 0x7953, 0 };
+        short ai[] = { 0x694c, 0x5454, 0x656c, 0x6e45, 0x6944, 0x6e61, 0 };
+        void _a(void) { char*s = (char*)am; s = (char *)ai; }
+        short ei[] = { 0x89D3, 0xe3e3, 0x8593, 0x95c5, 0x89c4, 0x9581, 0 };
+        short em[] = { 0xc2c9, 0xc785, 0x95c4, 0x8981, 0x95e2, 0xa8e2, 0 };
+        void _e(void) { char*s = (char*)em; s = (char*)ei; }
+        int main(void) { _a(); _e(); return 0; }
+EOF
+      ]
+      if test -f conftest.c
+      then 
+        if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
+            && test -f conftest.o
+        then
+          if test `grep -l BIGenDianSyS conftest.o`
+          then
+            AC_MSG_RESULT("big endian")
+            ac_cv_c_bigendian=yes
+          fi
+          if test `grep -l LiTTleEnDian conftest.o`
+          then
+            AC_MSG_RESULT("little endian")
+            ac_cv_c_bigendian=no
+          fi
+        fi
+      fi
+      if test $ac_cv_c_bigendian = xunknown
+      then
+        AC_MSG_ERROR([Could not guess endianness, please use --with-words])
+      fi
+      dnl  Now we know what to use for endianness, just put it in the header
+      if test $ac_cv_c_bigendian = yes
+      then
+        cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
+      fi
+      ;;
+  esac
 fi
 
 dnl Check for system libs needed
@@ -51,27 +129,29 @@ AC_CHECK_FUNC(inet_aton,,[
 ])
 AC_CHECK_FUNCS(vasprintf)
 AC_CHECK_FUNCS(swab)
+AC_CHECK_FUNCS([memalign valloc])
 
 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)
+    [NEED_GETOPT=1])])
 
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
+AC_CHECK_LIB(m,cos,LIB_IMDCT="${LIB_IMDCT} -lm")
 AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm")
 
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-CFLAGS="${CFLAGS} -I/usr/local/include"
-
 dnl Check for pthreads - borrowed from XMMS
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+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
@@ -79,10 +159,13 @@ 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
-  THREAD_LIBS=""
   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,
@@ -93,7 +176,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 
 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/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)
@@ -103,133 +186,388 @@ dnl Check for threads library
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
 
 dnl Check for ntohl, etc.
-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 <sys/param.h> defines ntohl.)
- AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_CACHE_CHECK([for ntohl in sys/param.h],
+    [ac_cv_c_ntohl_sys_param_h],
+    [CFLAGS="${save_CFLAGS} -Wall -Werror"
+     AC_TRY_COMPILE([#include <sys/param.h>],
+        [void foo() { int meuh; ntohl(meuh); }],
+        ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)])
+if test x"$ac_cv_c_ntohl_sys_param_h" != x"no"; then
+    AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
+fi
+
+dnl Check for inline function size limit
+AC_CACHE_CHECK([if \$CC accepts -finline-limit],
+    [ac_cv_c_inline_limit],
+    [CFLAGS="${save_CFLAGS} -finline-limit-30000"
+     AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)])
+if test x"$ac_cv_c_inline_limit" != x"no"; then
+    save_CFLAGS="${save_CFLAGS} -finline-limit-30000"
+fi
 
 dnl Check for Darwin plugin linking flags
-CFLAGS="${save_CFLAGS} -bundle -undefined suppress"
-AC_MSG_CHECKING([if \$CC compiles plugins with -bundle -undefined suppress])
-AC_TRY_COMPILE([],,
- PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
+AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error],
+    [ac_cv_ld_darwin],
+    [CFLAGS="${save_CFLAGS} -bundle -undefined error"
+     AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)])
+if test x"$ac_cv_ld_darwin" != x"no"; then
+    PLCFLAGS="${PLCFLAGS} -bundle -undefined error"
+fi
 
 dnl Check for standard plugin linking flags
-CFLAGS="${save_CFLAGS} -shared"
-AC_MSG_CHECKING([if \$CC compiles plugins with -shared])
-AC_TRY_COMPILE([],,
- PLCFLAGS="${PLCFLAGS} -shared"; AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
+AC_CACHE_CHECK([if \$CC accepts -shared],
+    [ac_cv_ld_plugins],
+    [CFLAGS="${save_CFLAGS} -shared"
+     AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
+if test x"$ac_cv_ld_plugins" != x"no"; then
+    PLCFLAGS="${PLCFLAGS} -shared"
+fi
+        
+dnl Check for soname setting
+if test x"${SOFLAGS}" = x; then
+    AC_CACHE_CHECK([for soname setting],
+        [ac_cv_ld_soname],
+        [
+        # Standard
+        try_SOFLAGS="-Wl,-soname -Wl,"
+        LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+        AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}", [
+            # SunOS
+            try_SOFLAGS="-Wl,-h -Wl,"
+            LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+            AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}",
+                ac_cv_ld_soname=none)
+        ])])
+    if test x"$ac_cv_ld_soname" != x"none"; then
+        SOFLAGS=$ac_cv_ld_soname
+    else
+        echo "
+------------
+Your system doesn't seem to have support for dynamic linking. You may
+have problems using libdvdcss.
+------------
+"
+    fi
+fi
+
+dnl Checks for __attribute__(aligned()) directive
+AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
+    [ac_cv_c_attribute_aligned],
+    [ac_cv_c_attribute_aligned=0
+       CFLAGS="${save_CFLAGS} -Werror"
+    for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
+        AC_TRY_COMPILE([],
+        [static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;],
+        [ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try])
+    done])
+if test x"$ac_cv_c_attribute_aligned" != x"0"; then
+    AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
+        [$ac_cv_c_attribute_aligned],[Maximum supported data alignment])
+fi
 
 dnl End of the bizarre compilation tests
 CFLAGS="${save_CFLAGS}"
+LDFLAGS="${save_LDFLAGS}"
 
 dnl Check for boolean_t
-AC_MSG_CHECKING([for boolean_t in sys/types.h])
-AC_TRY_COMPILE([#include <sys/types.h>
-void quux() { boolean_t foo; }],,
- AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if <sys/types.h> defines boolean_t.)
- AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-AC_MSG_CHECKING([for boolean_t in pthread.h])
-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_CACHE_CHECK([for boolean_t in sys/types.h],
+    [ac_cv_c_boolean_t_sys_types_h],
+    [AC_TRY_COMPILE([#include <sys/types.h>], [boolean_t foo;],
+     ac_cv_c_boolean_t_sys_types_h=yes, ac_cv_c_boolean_t_sys_types_h=no)])
+if test x"$ac_cv_c_boolean_t_sys_types_h" != x"no"; then
+    AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if <sys/types.h> defines boolean_t.)
+fi
+
+AC_CACHE_CHECK([for boolean_t in pthread.h],
+    [ac_cv_c_boolean_t_pthread_h],
+    [AC_TRY_COMPILE([#include <pthread.h>], [boolean_t foo;],
+     ac_cv_c_boolean_t_pthread_h=yes, ac_cv_c_boolean_t_pthread_h=no)])
+if test x"$ac_cv_c_boolean_t_pthread_h" != x"no"; then
+    AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
+fi
+
+AC_CACHE_CHECK([for boolean_t in cthreads.h],
+    [ac_cv_c_boolean_t_cthreads_h],
+    [AC_TRY_COMPILE([#include <cthreads.h>], [boolean_t foo;],
+     ac_cv_c_boolean_t_cthreads_h=yes, ac_cv_c_boolean_t_cthreads_h=no)])
+if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then
+    AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
-ARCH=${host_cpu}
+
+ARCH=${target_cpu}
 
 dnl
 dnl  default modules
 dnl
-BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix"
-PLUGINS="${PLUGINS}"
+#BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy yuv2rgb8 idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
+BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
+PLUGINS="${PLUGINS} ac3_spdif spudec"
 
 dnl
 dnl  Accelerated modules
 dnl
-MMX_MODULES="yuvmmx idctmmx motionmmx"
-MMXEXT_MODULES="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
-
-AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
-AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
+MMX_MODULES="memcpymmx idctmmx motionmmx"
+MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
+THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
+SSE_MODULES="imdctsse downmixsse"
+ALTIVEC_MODULES="idctaltivec motionaltivec"
+
+AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
+    [ac_cv_mmx_inline],
+    [AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));],
+                    ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)])
+if test x"$ac_cv_mmx_inline" != x"no"; then
   ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
-  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+fi
 
-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));}],,
+AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly],
+    [ac_cv_mmxext_inline],
+    [AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));],
+                    ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)])
+if test x"$ac_cv_mmxext_inline" != x"no"; then
   ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
-  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+fi
+
+AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly],
+    [ac_cv_3dnow_inline],
+    [AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
+                    ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
+if test x"$ac_cv_3dnow_inline" != x"no"; then
+  AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
+  ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
+fi
+
+AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
+    [ac_cv_sse_inline],
+    [AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
+                    ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
+if test x"$ac_cv_sse_inline" != x"no"; then
+  AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
+  ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
+fi
+
+AC_CACHE_CHECK([if \$CC groks Altivec inline assembly],
+    [ac_cv_altivec_inline],
+    [AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
+         ac_cv_altivec_inline=yes,
+         [save_CFLAGS=$CFLAGS
+          CFLAGS="$CFLAGS -Wa,-m7400"
+          AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
+            [ac_cv_altivec_inline="-Wa,-m7400"],
+            ac_cv_altivec_inline=no)
+          CFLAGS=$save_CFLAGS
+         ])])
+if test x"$ac_cv_altivec_inline" != x"no"; then
+  AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.)
+  if test x"$ac_cv_altivec_inline" != x"yes"; then
+    CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_altivec_inline"
+  fi
+  ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+fi
+
+AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
+    [ac_cv_c_altivec],
+    [save_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS -faltivec"
+     # Darwin test
+     AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
+        ac_cv_c_altivec=-faltivec, [
+        # Linux/PPC test
+        CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec"
+        AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
+            [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
+        ])
+     CFLAGS=$save_CFLAGS
+    ])
+if test x"$ac_cv_c_altivec" != x"no"; then
+  AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.)
+  CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_c_altivec"
+  ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+fi
+
+AC_CACHE_CHECK([if linker needs -framework vecLib],
+    [ac_cv_ld_altivec],
+    [save_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -framework vecLib"
+     AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)
+     LDFLAGS=$save_LDFLAGS
+    ])
+if test x"$ac_cv_ld_altivec" != x"no"; then
+  LIB_ALTIVEC="-framework vecLib"
+fi
+
+dnl
+dnl  Check the operating system
+dnl
+case ${target_os} in
+  linux*)
+    SYS=linux
+       ;;
+  bsdi*)
+    SYS=bsdi
+    ;;
+  darwin*)
+    SYS=darwin
+    ;;
+  *mingw32*)
+    SYS=mingw32
+    ;;
+  *nto*)
+    SYS=nto
+    LIB_X11="${LIB_X11} -lsocket"
+    LIB_XVIDEO="${LIB_XVIDEO} -lsocket"
+    ;;
+  *)
+    SYS=${target_os}
+    ;;
+esac
+
+dnl
+dnl Windoze specific section
+dnl
+if test $SYS = mingw32; then
+AC_CHECK_TOOL(WINDRES, windres, :)
+LIB_MPEG_TS="-lws2_32"
+LIB_RC="-lws2_32"
+fi
 
 dnl
 dnl  libdvdcss: check for DVD ioctls
 dnl
 
+dnl  default is no
+CAN_BUILD_LIBDVDCSS=0
+
 dnl  for windoze
 AC_CHECK_HEADERS(winioctl.h,[
-  LIBDVDCSS=1
+  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
 ])
 
-dnl  for Un*x
+dnl  for Un*x and BeOS
 AC_CHECK_HEADERS(sys/ioctl.h,[
-  LIBDVDCSS=1
-  AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h)
+  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
+  OPENBSD_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
+  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.)
+    AC_EGREP_HEADER(struct dvd_struct,sys/cdio.h,[
+                    BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1; OPENBSD_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
+  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.)
+    AC_EGREP_HEADER(struct dvd_struct,sys/dvdio.h,[
+                    BSD_DVD_STRUCT=1],[LINUX_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.)
+    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.)
+    if test x$OPENBSD_DVD_STRUCT = x1; then
+      AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1,
+                Define if OpenBSD-like dvd_struct is defined.)
+    fi
+  else
+    if test x$BSD_DVD_STRUCT = x1; then
+      AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
+                Define if FreeBSD-like dvd_struct is defined.)
+    fi
+  fi
 ])
 
+
 dnl
 dnl  Check the operating system
 dnl
-case ${host_os} in
+case ${target_os} in
+  bsdi*)
+    SYS=bsdi
+    ;;
   darwin*)
     SYS=darwin
     ;;
   *)
-    SYS=${host_os}
+    SYS=${target_os}
     ;;
 esac
 
 dnl
-dnl  PentiumPro acceleration
+dnl  Special arch tuning
+dnl
+AC_ARG_WITH(tuning,
+[  --with-tuning=[arch]    Enable special tuning for an architecture
+                          (default i686 on IA-32 and 750 on PPC)])
+if test "x$withval" != "x"; then
+    TUNING=$withval
+else
+    if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xi486 -o x${target_cpu} = xi386; then TUNING="pentiumpro"
+    else
+        if test x${target_cpu} = xpowerpc; then TUNING="750"; fi
+    fi
+fi
+
+dnl
+dnl  Enable release-specific flags
 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 ])
+AC_ARG_ENABLE(release,
+[  --enable-release        Activate extra optimizations (default disabled)],
+[ if test x$enableval = xyes; then RELEASE=1; fi ],
+[ VLC_VERSION="${VLC_VERSION}_`date +%Y-%m-%d`";
+  LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ])
 
 dnl
 dnl  MMX acceleration
@@ -237,48 +575,53 @@ 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_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 ])
+    BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
+[ if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_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)],
+[  --disable-altivec       Disable altivec optimizations (default enabled on PPC)],
 [ 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 ])
+    BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
+[ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec";
+    BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; 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 ])
 
-dnl
-dnl  Enable/disable statistics
-dnl
-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  Profiling
 dnl
-AC_ARG_ENABLE(profiling,
-[  --enable-profiling      Enable gprof profiling (default disabled)],
-[ if test x$enableval = xyes; then PROFILING=1; fi ])
+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
@@ -305,54 +648,178 @@ AC_ARG_ENABLE(pth,
 LIB="${LIB} ${THREAD_LIB}"
 
 dnl
-dnl  CSS DVD decryption
+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 DVDREAD module: check for libdvdread plugin
 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
+AC_ARG_ENABLE(dvdread,
+[  --enable-dvdread          Enable dvdread support (default disabled)],
+[ if test x$enableval = xyes
+  then
+    NEED_LIBDVDCSS=1
+    STATIC_LIBDVDCSS=1
+    BUILTINS="${BUILTINS} dvdread" 
+    CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I../../extras/libdvdread"
+    LIB_DVDREAD="${LIB_DVDREAD} lib/libdvdread.a lib/libdvdcss.a"
+  fi ])
 
 dnl
-dnl  DVD module: check for installed libdvdcss or local libdvdcss
-dnl  TODO: use user-provided --with-dvdcss flag
-dnl
-AC_CHECK_HEADERS(videolan/dvdcss.h,[
-  # installed libdvdcss
-  BUILTINS="${BUILTINS} dvd"
-  LIB_DVD="${LIB_DVD} -ldvdcss"],
-  [if test x${LIBDVDCSS} = x1; then
-    # local libdvdcss
-    LOCAL_LIBDVDCSS=1
-    BUILTINS="${BUILTINS} dvd"
-    CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
-  fi])
+dnl  VCD module
+dnl
+AC_ARG_ENABLE(vcd,
+  [  --enable-vcd            VCD support for Linux (default enabled)])
+
+if test x$enable_vcd != xno
+then
+  AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
+    BUILTINS="${BUILTINS} vcd"
+  ])
+fi
+
+if test x$enable_vcd != xno -a "${SYS}" = "bsdi"
+then
+  BUILTINS="${BUILTINS} vcd"
+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
+
+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
+
+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
+  [  --disable-rc            Remote Control module (default enabled)])
+
+if test x$enable_rc != xno
+then
+  BUILTINS="${BUILTINS} rc"
+fi
+
+dnl
+dnl  mad plugin
+dnl
+AC_ARG_WITH(mad,
+  [  --with-mad[=PATH]       libmad module (default disabled)],
+  [ if test "x$with_val" != "xno"; then
+      if test -n $with_val; then
+           CFLAGS_MAD="-I$with_val/include"
+        LIB_MAD="-L$with_val/lib -lmad"
+      else
+        LIB_MAD="-lmad"
+      fi
+      save_CFLAGS=$CFLAGS
+      save_LDFLAGS=$LDFLAGS
+      CFLAGS="$CFLAGS $CFLAGS_MAD"
+      LDFLAGS="$LDFLAGS $LIB_MAD"
+      AC_CHECK_HEADERS(mad.h, ,
+      [ echo "Cannot find development headers for libmad..."
+        exit 1
+      ])
+      AC_CHECK_LIB(mad, mad_bit_init, ,
+      [ echo "Cannot find libmad library..."
+        exit 1
+      ])
+      CFLAGS=$save_CFLAGS
+      LDFLAGS=$save_LDFLAGS
+      PLUGINS="${PLUGINS} mad"
+    fi ])
 
 dnl special case for BeOS
-if test x$SYS = xbeos; then
+if test x$SYS = xbeos
+then
     BUILTINS="${BUILTINS} beos"
     LIB_BEOS="-lbe -lgame -lroot -ltracker"
     PLCFLAGS="${PLCFLAGS} -nostart"
@@ -362,11 +829,16 @@ else
 
 dnl
 dnl  OSS /dev/dsp module
+dnl  (enabled by default except on win32)
 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
+
+if test x$enable_dsp != xno &&
+  (test $SYS != mingw32 || test x$enable_dsp = xyes)
+then
+  if test -c /dev/dsp
+  then
     PLUGINS="${PLUGINS} dsp"
   fi
 fi
@@ -376,58 +848,82 @@ dnl  Esound module
 dnl
 AC_ARG_ENABLE(esd,
   [  --enable-esd            Esound library support (default disabled)],
-  [if test x$enable_esd = xyes; then
+  [if test x$enable_esd = xyes
+   then
      AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-     if test x${ESD_CONFIG} != xno; then
+     if test x${ESD_CONFIG} != xno
+     then
        PLUGINS="${PLUGINS} esd"
+       CFLAGS_ESD="`${ESD_CONFIG} --cflags`"
        LIB_ESD="`${ESD_CONFIG} --libs`"
      fi
    fi])
 
 dnl
-dnl  Darwin module
+dnl  aRts module
 dnl
-AC_ARG_ENABLE(darwin,
-  [  --enable-darwin         Darwin sound support (default disabled)],
-  [if test x$enable_darwin = xyes; then
-     PLUGINS="${PLUGINS} darwin"
-     LIB_DARWIN="-framework CoreAudio"
+AC_ARG_ENABLE(arts,
+  [  --enable-arts           aRts sound server (default disabled)],
+  [if test x$enable_arts = xyes
+   then
+     AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
+     if test x${ARTS_CONFIG} != xno
+     then
+       PLUGINS="${PLUGINS} arts"
+       CFLAGS_ARTS="`${ARTS_CONFIG} --cflags`"
+       LIB_ARTS="`${ARTS_CONFIG} --libs `"
+     fi
    fi])
 
 dnl
 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
+  [  --enable-macosx         MacOS X support (default enabled on MacOS X)],
+  [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_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
+     LIB="${LIB} -ObjC"
    fi],
-  [AC_CHECK_HEADERS(Carbon/Carbon.h,
+  [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
      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_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
+     LIB="${LIB} -ObjC"
    )])
 
+dnl
+dnl  QNX RTOS module
+dnl
+AC_ARG_ENABLE(qnx,
+  [  --disable-qnx           QNX RTOS support (default enabled on 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
@@ -438,60 +934,100 @@ 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";
-    then
-      PLUGINS="${PLUGINS} sdl";
-      if test "x$withval" != "xyes";
+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
-        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -lSDL"
-        CFLAGS_SDL="-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"
-      fi
-    fi ])
-    if test "x$withval" = "x";
+        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_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $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),
+      [ AC_MSG_ERROR([The development package for SDL is not installed. 
+Please install it and try again. Alternatively you can also configure with 
+--disable-sdl.])
+      ])
+    CPPFLAGS=$save_CPPFLAGS
+    if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
     then
-      AC_CHECK_HEADERS(SDL/SDL.h,
-      [PLUGINS="${PLUGINS} sdl"
-       LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"])
+      AC_MSG_ERROR([The development package for SDL is not installed.
+Please install it and try again. Alternatively you can also configure with
+--disable-sdl.])
     fi
+  elif test "x$enable_sdl" =  "xyes"
+  then
+    AC_MSG_ERROR([I couldn't find the SDL package. You can download libSDL
+from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
+    ])
+  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";
+AC_ARG_ENABLE(directx,
+  [  --disable-directx       Windows DirectX support (default enabled on WIN32)])
+if test "x$enableval" != "xno"
+then
+  if test $SYS = mingw32
+  then
+    AC_ARG_WITH(directx-path, 
+    [  --with-directx-path=path Windows DirectX headers and libraries])
+    if test "x$with_directx_path" = "x"
     then
-      PLUGINS="${PLUGINS} directx";
-      if test "x$withval" != "xyes";
+      AC_CHECK_HEADERS(directx.h,
+      [ PLUGINS="${PLUGINS} directx"
+        LIB_DIRECTX="-lgdi32 -ldxguid" ])
+    else
+      AC_MSG_CHECKING(for directX headers in ${withval})
+      if test -f ${withval}/include/directx.h
       then
-        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
-        INCLUDE="${INCLUDE} -I"$withval"/include"
+        PLUGINS="${PLUGINS} directx"
+        LIB_DIRECTX="-L${withval}/lib -lgdi32 -ldxguid"
+        INCLUDE="${INCLUDE} -I${withval}/include"
+        AC_MSG_RESULT(yes)
       else
-        AC_CHECK_HEADERS(directx.h, , [echo "Cannot find DirectX headers !"; exit])
-        LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR([Cannot find ${withval}/include/directx.h!])
       fi
-    fi ])
-    if test "x$withval" = "x";
-    then
-      AC_CHECK_HEADERS(directx.h,
-      [PLUGINS="${PLUGINS} directx"
-       LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"])
     fi
+  fi
+fi
 
 dnl
 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" -lm"
       else
@@ -518,7 +1054,7 @@ AC_ARG_ENABLE(qt,
      PLUGINS="${PLUGINS} qt"
      ALIASES="${ALIASES} qvlc"
      LIB_QT="-lqt -L${QTDIR}/lib"
-     if test -x ${QTDIR}/bin/moc ;
+     if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc
      else
@@ -531,7 +1067,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
@@ -539,32 +1085,72 @@ 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"
-     LIB_GNOME="`gnome-config --libs gnomeui | sed 's,-rdynamic,,'`"
-   fi])
+    # look for gnome-config
+    AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+    if test -x ${GNOME_CONFIG}
+    then
+       CFLAGS_GNOME="`${GNOME_CONFIG} --cflags gnomeui`"
+       LIB_GNOME="`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"
+    fi
+    # now look for the gnome.h header
+    saved_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $CFLAGS_GNOME"
+    AC_CHECK_HEADERS(gnome.h, [
+      PLUGINS="${PLUGINS} gnome"
+      ALIASES="${ALIASES} gnome-vlc"
+     ],[
+      AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
+developement librairie or remove the --enable-gnome option])
+     ])
+  
+    CPPFLAGS=$saved_CPPFLAGS
+  fi])
 
 dnl
 dnl  Gtk+ module
 dnl
 AC_ARG_ENABLE(gtk,
   [  --disable-gtk           Gtk+ support (default enabled)])
-if test x$enable_gtk != xno; then
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  if test x${GTK_CONFIG} != xno; then
-    PLUGINS="${PLUGINS} gtk"
-    ALIASES="${ALIASES} gvlc"
+if test x$enable_gtk != xno
+then
+  GTK_PATH=$PATH
+  AC_ARG_WITH(gtk-config-path,
+    [  --with-gtk-config-path=path gtk-config path (default search in \$PATH)],
+    [ if test "x$withval" != "xno"
+      then
+        GTK_PATH=$withval:$PATH
+      fi ])
+  # look for gtk-config
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH)
+  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"
+  FOUND=
+  AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, ,
+  [
+    FOUND=no
+       echo "Cannot find gtk development headers."
+  ])
+  if test -z $FOUND; then
+    PLUGINS="${PLUGINS} gtk"
+    ALIASES="${ALIASES} gvlc"
+  fi
+  CPPFLAGS=$saved_CPPFLAGS
 fi
 
 dnl
 dnl  X11 module
+dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(x11,
   [  --disable-x11           X11 support (default enabled)])
-if test x$enable_x11 != xno; then
+if test x$enable_x11 != xno &&
+  (test $SYS != mingw32 || test x$enable_x11 = xyes); then
   if test x$x_includes = xNONE; then
     x_includes=/usr/X11R6/include
   fi
@@ -574,7 +1160,7 @@ if test x$enable_x11 != xno; then
   saved_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -I$x_includes"
   AC_CHECK_HEADERS(X11/Xlib.h, [
-    PLUGINS="${PLUGINS} x11"
+    #PLUGINS="${PLUGINS} x11"
     LIB_X11="-L$x_libraries -lX11 -lXext"
     CFLAGS_X11="-I$x_includes"
   ]
@@ -583,10 +1169,12 @@ fi
 
 dnl
 dnl  XVideo module
+dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(xvideo,
   [  --disable-xvideo        XVideo support (default enabled)])
-if test x$enable_xvideo != xno; then
+if test x$enable_xvideo != xno &&
+  (test $SYS != mingw32 || test x$enable_xvideo = xyes); then
   if test x$x_includes = xNONE; then
     x_includes=/usr/X11R6/include
   fi
@@ -596,7 +1184,7 @@ if test x$enable_xvideo != xno; then
   saved_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -I$x_includes"
   AC_CHECK_HEADERS(X11/extensions/Xv.h, [
-    PLUGINS="${PLUGINS} xvideo"
+    BUILTINS="${BUILTINS} xvideo"
     LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
     CFLAGS_X11="-I$x_includes"
   ]
@@ -607,15 +1195,33 @@ 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 x$have_alsa = xtrue; then
-     PLUGINS="${PLUGINS} alsa"
-     LIB_ALSA="-lasound"
-   fi; fi])
+  [  --enable-alsa           Alsa sound drivers support (Only for linux)
+                          (default disabled)],
+  [if test x$enable_alsa = xyes
+   then
+     AC_CHECK_HEADER(alsa/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
 
+dnl
+dnl  Plug-ins - this must be AT THE END
+dnl
+AC_ARG_ENABLE(plugins,
+  [  --disable-plugins       Make all plug-ins built-in (default plug-ins enabled)],
+  [if test x$enable_plugins = xno
+   then
+     BUILTINS="${BUILTINS} ${PLUGINS}"
+     PLUGINS=
+   fi])
+
+
 dnl 
 dnl  Configuration is finished
 dnl
@@ -627,47 +1233,72 @@ AC_SUBST(ALIASES)
 AC_SUBST(DEFINE)
 AC_SUBST(INCLUDE)
 AC_SUBST(DEBUG)
-AC_SUBST(STATS)
 AC_SUBST(ASM)
 AC_SUBST(TRACE)
-AC_SUBST(PROFILING)
+AC_SUBST(CPROF)
+AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
-AC_SUBST(CSS)
+AC_SUBST(TUNING)
+AC_SUBST(RELEASE)
+AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
+AC_SUBST(WINDRES)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
 
 AC_SUBST(LCFLAGS)
 AC_SUBST(PLCFLAGS)
-AC_SUBST(LIB)
+AC_SUBST(SOFLAGS)
 
+AC_SUBST(LIB)
 AC_SUBST(LIB_ALSA)
+AC_SUBST(LIB_ALTIVEC)
+AC_SUBST(LIB_ARTS)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
+AC_SUBST(LIB_DIRECTX)
 AC_SUBST(LIB_DVD)
+AC_SUBST(LIB_DVD_PLUGIN)
+AC_SUBST(LIB_DVDREAD)
+AC_SUBST(LIB_DVDREAD_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_KDE)
+AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_MACOSX)
+AC_SUBST(LIB_MAD)
+AC_SUBST(LIB_MPEG_TS)
 AC_SUBST(LIB_NCURSES)
+AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_QT)
-AC_SUBST(LIB_TS)
+AC_SUBST(LIB_RC)
 AC_SUBST(LIB_SDL)
-AC_SUBST(LIB_DIRECTX)
 AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)
 
 AC_SUBST(CFLAGS_VLC)
+AC_SUBST(CFLAGS_ALTIVEC)
 AC_SUBST(CFLAGS_DVD)
+AC_SUBST(CFLAGS_DVDREAD)
+AC_SUBST(CFLAGS_LIBDVDCSS)
+AC_SUBST(CFLAGS_ARTS)
+AC_SUBST(CFLAGS_ESD)
 AC_SUBST(CFLAGS_GTK)
+AC_SUBST(CFLAGS_MAD)
 AC_SUBST(CFLAGS_SDL)
 AC_SUBST(CFLAGS_X11)
 
-AC_SUBST(LOCAL_LIBDVDCSS)
+AC_SUBST(OBJ_DVD)
+AC_SUBST(OBJ_LIBDVDCSS)
+
+AC_SUBST(NEED_LIBDVDCSS)
 
-AC_OUTPUT([Makefile.opts include/config.h])
+AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in])
+#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in])
 
 echo "
 global configuration
@@ -675,24 +1306,48 @@ global configuration
 system                : ${SYS}
 architecture          : ${ARCH}
 optimizations         : ${OPTIMS}
-inline assembly       : ${ASM}
+tuning:               : ${TUNING}
+release:              : ${RELEASE}"
 
+if test x${HAVE_VLC} = x1
+then
+  echo "
 vlc configuration
 -----------------
 vlc version           : ${VLC_VERSION}
 debug mode            : ${DEBUG}
-statistics            : ${STATS}
 trace mode            : ${TRACE}
-profiling             : ${PROFILING}
-need builtin getopt   : ${GETOPT}
+cprof/gprof support   : ${CPROF}/${GPROF}
+need builtin getopt   : ${NEED_GETOPT}
 built-in modules      :${BUILTINS}
-plugin modules        :${PLUGINS}
-vlc aliases           :${ALIASES}
+plug-in modules       :${PLUGINS}
+vlc aliases           :${ALIASES}"
+fi
 
+echo "
 libdvdcss configuration
 -----------------------
-CSS decryption        : ${CSS}
+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
 
-You may now tune Makefile.opts at your convenience. To build vlc, type
-\`make vlc'. To build libdvdcss only, type \`make libdvdcss'."
+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 ""