]> git.sesse.net Git - vlc/blobdiff - configure.in
* ./plugins/lirc/lirc.c: IR remote control plugin by Sigmund Augdal
[vlc] / configure.in
index c9ae161ebd458d6889e6b6024e8af7ac652bc8e0..9e25b8779d2a2d43dab9933306927d113e90a55e 100644 (file)
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc and libdvdcss
-AC_INIT(include/common.h)
+AC_INIT(include/main.h)
 AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_SYSTEM
@@ -8,9 +8,7 @@ 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
@@ -31,30 +29,28 @@ dnl Check for tools
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_CPP
+
+dnl Find the right ranlib, even when cross-compiling
 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")
+AC_DEFINE_UNQUOTED(PACKAGE, "vlc")
+AC_DEFINE_UNQUOTED(VERSION, "$VLC_VERSION")
 AM_GNU_GETTEXT
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
 dnl
-dnl  Endianness check, with a special test for cross-compilation
+dnl  Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling
 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)])
+dnl  We give the user the opportunity to specify
+dnl  --with-words=big or --with-words=little ; otherwise, try to guess
+dnl
+AC_ARG_WITH(words,
+  [  --with-words=endianness Set endianness (big or little)])
   case "x$withval" in
     xbig)
       ac_cv_c_bigendian=yes
@@ -65,9 +61,10 @@ else
     *)
       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
+      AC_CACHE_CHECK([whether the byte order is big-endian],
+        [ac_cv_c_bigendian],
+        [ac_cv_c_bigendian=unknown
+        [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; }
@@ -76,42 +73,37 @@ else
         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`
+        ]
+        if test -f conftest.c
+        then 
+          if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
+              && test -f conftest.o
           then
-            AC_MSG_RESULT("little endian")
-            ac_cv_c_bigendian=no
+            if test `grep -l BIGenDianSyS conftest.o`
+            then
+              ac_cv_c_bigendian=yes
+            fi
+            if test `grep -l LiTTleEnDian conftest.o`
+            then
+              ac_cv_c_bigendian=no
+            fi
           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
+dnl  Now we know what to use for endianness, just put it in the header
+if test $ac_cv_c_bigendian = yes
+then
+  AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system)
 fi
 
 dnl Check for system libs needed
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol)
-AC_CHECK_FUNCS(setenv putenv)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty)
 AC_CHECK_FUNC(connect,,[
   AC_CHECK_LIB(socket,connect,LIB="${LIB} -lsocket")
 ])
@@ -141,10 +133,11 @@ AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
     [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,cos,LIB_IMDCT="${LIB_IMDCT} -lm")
+AC_CHECK_LIB(m,cos,
+  LIB_IMDCT="${LIB_IMDCT} -lm"
+  LIB_FILTER_DISTORT="${LIB_FILTER_DISTORT} -lm")
 AC_CHECK_LIB(m,pow,
   LIB_IMDCT="${LIB_IMDCT} -lm"
   LIB_IMDCT3DN="${LIB_IMDCT3DN} -lm"
@@ -179,16 +172,38 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
             Define if <strings.h> defines strncasecmp.)])
 
 dnl Check for headers
-AC_CHECK_HEADERS(stddef.h getopt.h strings.h)
+AC_CHECK_HEADERS(getopt.h strings.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)
 AC_CHECK_HEADERS(machine/param.h)
 
+AC_HEADER_TIME
+
 dnl Check for threads library
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
 
+dnl Check for DPMS
+if test x$SYS != xmingw32
+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/dpms.h, [
+    AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[
+      AC_DEFINE(DPMSINFO_IN_DPMS_H, 1,
+                Define if <X11/extensions/dpms.h> defines DPMSInfo.)
+    ])
+  ])
+  CPPFLAGS=$saved_CPPFLAGS
+fi
+
 dnl Check for ntohl, etc.
 AC_CACHE_CHECK([for ntohl in sys/param.h],
     [ac_cv_c_ntohl_sys_param_h],
@@ -209,13 +224,91 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then
     save_CFLAGS="${save_CFLAGS} -finline-limit-30000"
 fi
 
+dnl Check for -W or -w flags
+AC_CACHE_CHECK([if \$CC accepts -Wall -Winline],
+    [ac_cv_c_Wall_Winline],
+    [CFLAGS="${save_CFLAGS} -Wall -Winline"
+     AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)])
+if test x"$ac_cv_c_Wall_Winline" != x"no"; then
+    save_CFLAGS="${save_CFLAGS} -Wall -Winline"
+else
+    AC_CACHE_CHECK([if \$CC accepts -wall -winline],
+        [ac_cv_c_wall_winline],
+        [CFLAGS="${save_CFLAGS} -wall -winline"
+         AC_TRY_COMPILE([],,ac_cv_c_wall_winline=yes, ac_cv_c_wall_winline=no)])
+    if test x"$ac_cv_c_wall_winline" != x"no"; then
+        save_CFLAGS="${save_CFLAGS} -wall -winline"
+    fi
+fi
+
+dnl Check for -pipe
+AC_CACHE_CHECK([if \$CC accepts -pipe],
+    [ac_cv_c_pipe],
+    [CFLAGS="${save_CFLAGS} -pipe"
+     AC_TRY_COMPILE([],,ac_cv_c_pipe=yes, ac_cv_c_pipe=no)])
+if test x"$ac_cv_c_pipe" != x"no"; then
+    save_CFLAGS="${save_CFLAGS} -pipe"
+fi
+
+dnl Check for various optimization flags
+AC_CACHE_CHECK([if \$CC accepts -O3],
+    [ac_cv_c_o3],
+    [CFLAGS="${save_CFLAGS} -O3"
+     AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
+if test x"$ac_cv_c_o3" != x"no"; then
+    CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
+else
+    AC_CACHE_CHECK([if \$CC accepts -O2],
+        [ac_cv_c_o2],
+        [CFLAGS="${save_CFLAGS} -O2"
+         AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
+    if test x"$ac_cv_c_o2" != x"no"; then
+        CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
+    else
+        AC_CACHE_CHECK([if \$CC accepts -O],
+            [ac_cv_c_o],
+            [CFLAGS="${save_CFLAGS} -O"
+             AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+        if test x"$ac_cv_c_o" != x"no"; then
+            CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
+        fi
+    fi
+fi
+
+dnl Check for -ffast-math
+AC_CACHE_CHECK([if \$CC accepts -ffast-math],
+    [ac_cv_c_fast_math],
+    [CFLAGS="${save_CFLAGS} -ffast-math"
+     AC_TRY_COMPILE([],,ac_cv_c_fast_math=yes, ac_cv_c_fast_math=no)])
+if test x"$ac_cv_c_fast_math" != x"no"; then
+    CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math"
+fi
+
+dnl Check for -funroll-loops
+AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
+    [ac_cv_c_unroll_loops],
+    [CFLAGS="${save_CFLAGS} -funroll-loops"
+     AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
+if test x"$ac_cv_c_unroll_loops" != x"no"; then
+    CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops"
+fi
+
+dnl Check for -fomit-frame-pointer
+AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer],
+    [ac_cv_c_omit_frame_pointer],
+    [CFLAGS="${save_CFLAGS} -fomit-frame-pointer"
+     AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
+if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then
+    CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
+fi
+
 dnl Check for Darwin plugin linking flags
 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"
+    PLDFLAGS="${PLDFLAGS} -bundle -undefined error"
 fi
 
 dnl Check for standard plugin linking flags
@@ -224,7 +317,7 @@ AC_CACHE_CHECK([if \$CC accepts -shared],
     [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"
+    PLDFLAGS="${PLDFLAGS} -shared"
 fi
         
 dnl Check for soname setting
@@ -258,7 +351,7 @@ 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"
+        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;],
@@ -298,24 +391,28 @@ 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=${target_cpu}
+dnl
+dnl  Check the CPU
+dnl
+case x"${target_cpu}" in
+  x)
+    ARCH=unknown
+    ;;
+  *)
+    ARCH=${target_cpu}
+    ;;
+esac
 
 dnl
 dnl  default modules
 dnl
-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 chroma_yv12_rgb8 filter_bob filter_invert filter_wall"
+BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec"
+PLUGINS="${PLUGINS} lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort"
 
 dnl
 dnl  Accelerated modules
 dnl
-MMX_MODULES="memcpymmx idctmmx motionmmx"
+MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mmx chroma_i422_yuy2_mmx chroma_i420_ymga_mmx"
 MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
 THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
 SSE_MODULES="imdctsse downmixsse"
@@ -369,7 +466,9 @@ AC_CACHE_CHECK([if \$CC groks Altivec inline assembly],
 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"
+    CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_altivec_inline"
+    CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_altivec_inline"
+    CFLAGS_VLC="$CFLAGS_VLC $ac_cv_altivec_inline"
   fi
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
@@ -382,7 +481,7 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
      AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
         ac_cv_c_altivec=-faltivec, [
         # Linux/PPC test
-        CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec"
+        CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec"
         AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
             [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
         ])
@@ -390,7 +489,9 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
     ])
 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"
+  CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_c_altivec"
+  CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_c_altivec"
+  CFLAGS_VLC="$CFLAGS_VLC $ac_cv_c_altivec"
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
 
@@ -402,43 +503,66 @@ AC_CACHE_CHECK([if linker needs -framework vecLib],
      LDFLAGS=$save_LDFLAGS
     ])
 if test x"$ac_cv_ld_altivec" != x"no"; then
-  LIB_ALTIVEC="-framework vecLib"
+  LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib"
+  LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib"
+  LIB="${LIB} -framework vecLib"
 fi
 
 dnl
 dnl  Check the operating system
 dnl
-case ${target_os} in
-  linux*)
+case x"${target_os}" in
+  x)
+    SYS=unknown
+    ;;
+  xlinux*)
     SYS=linux
-       ;;
-  bsdi*)
+    ;;
+  xbsdi*)
     SYS=bsdi
     ;;
-  darwin*)
+  xdarwin*)
     SYS=darwin
     ;;
-  *mingw32*)
+  x*mingw32*)
     SYS=mingw32
+    AC_CHECK_TOOL(WINDRES, windres, :)
+    LIB_MPEG_TS="${LIB_MPEG_TS} -lws2_32"
+    LIB_RC="${LIB_RC} -lws2_32"
     ;;
-  *nto*)
+  x*nto*)
     SYS=nto
     LIB_X11="${LIB_X11} -lsocket"
     LIB_XVIDEO="${LIB_XVIDEO} -lsocket"
     ;;
-  *)
+  xbeos)
+    SYS=beos
+    LIB="${LIB} -lbe"
+    LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
+    PLDFLAGS="${PLDFLAGS} -nostart"
+    ;;
+  x*)
     SYS=${target_os}
     ;;
 esac
 
 dnl
-dnl Windoze specific section
+dnl  DVD and VCD devices
 dnl
-if test $SYS = mingw32; then
-AC_CHECK_TOOL(WINDRES, windres, :)
-LIB_MPEG_TS="-lws2_32"
-LIB_RC="-lws2_32"
-fi
+case x$SYS in
+  xmingw32)
+    DVD_DEVICE="E:"
+    VCD_DEVICE="E:"
+    ;;
+  *)
+    DVD_DEVICE="/dev/dvd"
+    VCD_DEVICE="/dev/cdrom"
+    ;;
+esac
+
+AC_DEFINE_UNQUOTED(DVD_DEVICE, "$DVD_DEVICE")
+AC_DEFINE_UNQUOTED(VCD_DEVICE, "$VCD_DEVICE")
+
 
 dnl
 dnl  libdvdcss: check for DVD ioctls
@@ -502,7 +626,7 @@ AC_CHECK_HEADERS(sys/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"
+      SRC_DVDCSS_EXTRA="${SRC_DVDCSS_EXTRA} bsdi_dvdioctl.c"
       LINUX_DVD_STRUCT=1
     ])
   ])
@@ -540,7 +664,6 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   fi
 ])
 
-
 dnl
 dnl  Special arch tuning
 dnl
@@ -566,14 +689,13 @@ AC_ARG_ENABLE(release,
   LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ])
 
 dnl
-dnl  MMX acceleration
+dnl  x86 accelerations
 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${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 ])
+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
@@ -657,81 +779,119 @@ AC_ARG_WITH(dvdcss,
   [ case "x${withval}" in
     xlocal-static|xyes)
       # local libdvdcss, statically linked
+      BUILTINS="${BUILTINS} dvd"
       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
+      PLUGINS="${PLUGINS} dvd"
       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"
+        LIB_DVD="${LIB_DVD} -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"
+      DUMMY_LIBDVDCSS=1
+      SRC_DVD_EXTRA="${SRC_DVD_EXTRA} dummy_dvdcss.c"
       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"
+      PLUGINS="${PLUGINS} dvd"
       if test "x$withval" != "xyes"
       then
-        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L"$withval"/lib"
+        LIB_DVD="${LIB_DVD} -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
+      BUILTINS="${BUILTINS} dvd"
       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"
+      DUMMY_LIBDVDCSS=1
+      SRC_DVD_EXTRA="${SRC_DVD_EXTRA} dummy_dvdcss.c"
       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(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 ])
+if test x${DUMMY_LIBDVDCSS} = x1; then STATIC_LIBDVDREAD=1; fi
+if test x${STATIC_LIBDVDCSS} = x1; then STATIC_LIBDVDREAD=1; fi
+AC_ARG_WITH(dvdread,
+  [  --with-dvdread[=name]   way to use libdvdread,
+                          same options as --with-dvdcss (default no)],
+  [ case "x${withval}" in
+    xlocal-static|xyes)
+      if test x${STATIC_LIBDVDREAD} = x1
+      then
+        BUILTINS="${BUILTINS} dvdread" 
+        CFLAGS_DVDREAD="${CFLAGS_DVDREAD} ${CFLAGS_DVD} -I../../extras/libdvdread"
+        LIB_DVDREAD="${LIB_DVDREAD} lib/libdvdread.a ${LIB_DVD}"
+      else
+        AC_MSG_ERROR([Can't link static dvdread with shared dvdcss])
+      fi
+    ;;
+    xno)
+    ;;
+    x)
+      if test x${STATIC_LIBDVDREAD} = x1
+      then
+        BUILTINS="${BUILTINS} dvdread" 
+        CFLAGS_DVDREAD="${CFLAGS_DVDREAD} ${CFLAGS_DVD} -I../../extras/libdvdread"
+        LIB_DVDREAD="${LIB_DVDREAD} lib/libdvdread.a ${LIB_DVD}"
+      else
+        PLUGINS="${PLUGINS} dvdread"
+        CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I../../extras/libdvdread  ${CFLAGS_DVD}"
+        LIB_DVDREAD="${LIB_DVDREAD} -Llib -ldvdread ${LIB_DVD}"
+      fi 
+    ;;
+    *)
+      if test "x$withval" != "xlocal-shared"
+      then
+        LIB_DVDREAD="${LIB_DVDREAD} -L"$withval"/lib"
+        CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I"$withval"/include"
+      else
+        LIB_DVDREAD="${LIB_DVDREAD} -L../../lib"
+        CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I../../extras/libdvdread"
+      fi
+      if test x${STATIC_LIBDVDCSS} = x1
+      then
+        AC_MSG_ERROR([Can't link shared dvdread with static dvdcss])
+      else
+        PLUGINS="${PLUGINS} dvdread"
+        CFLAGS_DVDREAD="${CFLAGS_DVDREAD} ${CFLAGS_DVD}"
+        LIB_DVDREAD="${LIB_DVDREAD} -ldvdread ${LIB_DVD}"
+      fi
+    esac
+    if test x${DUMMY_LIBDVDCSS} = x1
+    then
+      LIB_LIBDVDREAD="${LIB_LIBDVDREAD} -ldl"
+    else
+      LIB_LIBDVDREAD="${LIB_LIBDVDREAD} -L../../lib -ldvdcss"
+    fi ])
 
 dnl
 dnl  VCD module
@@ -791,10 +951,10 @@ 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"
+        CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include"
+        LIB_MAD="${LIB_MAD} -L$with_val/lib -lmad"
       else
-        LIB_MAD="-lmad"
+        LIB_MAD="${LIB_MAD} -lmad"
       fi
       save_CFLAGS=$CFLAGS
       save_LDFLAGS=$LDFLAGS
@@ -816,10 +976,7 @@ AC_ARG_WITH(mad,
 dnl special case for BeOS
 if test x$SYS = xbeos
 then
-    LIB="${LIB} -lbe"
     BUILTINS="${BUILTINS} beos"
-    LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
-    PLCFLAGS="${PLCFLAGS} -nostart"
 
 dnl default case
 else
@@ -832,12 +989,11 @@ AC_ARG_ENABLE(dsp,
   [  --disable-dsp           Linux /dev/dsp support (default enabled)])
 
 if test x$enable_dsp != xno &&
-  (test $SYS != mingw32 || test x$enable_dsp = xyes)
+  (test x$SYS != xmingw32 || test x$enable_dsp = xyes)
 then
-  if test -c /dev/dsp
-  then
+  AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, [
     PLUGINS="${PLUGINS} dsp"
-  fi
+  ])
 fi
 
 dnl
@@ -851,8 +1007,8 @@ AC_ARG_ENABLE(esd,
      if test x${ESD_CONFIG} != xno
      then
        PLUGINS="${PLUGINS} esd"
-       CFLAGS_ESD="`${ESD_CONFIG} --cflags`"
-       LIB_ESD="`${ESD_CONFIG} --libs`"
+       CFLAGS_ESD="${CFLAGS_ESD} `${ESD_CONFIG} --cflags`"
+       LIB_ESD="${LIB_ESD} `${ESD_CONFIG} --libs`"
      fi
    fi])
 
@@ -867,8 +1023,8 @@ AC_ARG_ENABLE(arts,
      if test x${ARTS_CONFIG} != xno
      then
        PLUGINS="${PLUGINS} arts"
-       CFLAGS_ARTS="`${ARTS_CONFIG} --cflags`"
-       LIB_ARTS="`${ARTS_CONFIG} --libs `"
+       CFLAGS_ARTS="${CFLAGS_ARTS} `${ARTS_CONFIG} --cflags`"
+       LIB_ARTS="${LIB_ARTS} `${ARTS_CONFIG} --libs `"
      fi
    fi])
 
@@ -880,12 +1036,14 @@ AC_ARG_ENABLE(macosx,
   [if test x$enable_macosx = xyes
    then
      BUILTINS="${BUILTINS} macosx"
-     LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
+     LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
+     CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
      LIB="${LIB} -ObjC"
    fi],
   [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
      BUILTINS="${BUILTINS} macosx"
-     LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
+     LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
+     CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
      LIB="${LIB} -ObjC"
    )])
 
@@ -898,10 +1056,23 @@ AC_ARG_ENABLE(qnx,
     then
       AC_CHECK_HEADERS(Ph.h, [
         PLUGINS="${PLUGINS} qnx"
-        LIB_QNX="-lasound -lph"
+        LIB_QNX="${LIB_QNX} -lasound -lph"
       ])
     fi
 
+dnl
+dnl  Liba52 AC3 decoder plugin
+dnl
+AC_ARG_ENABLE(liba52,
+  [  --disable-liba52        AC3 support with liba52 (default enabled)])
+if ((test "x$enableval" != "xno") && (test x$SYS != xmingw32))
+  then
+    AC_CHECK_HEADERS(a52dec/a52.h, [
+      BUILTINS="${BUILTINS} liba52_adec"
+      LIB_LIBA52_ADEC="${LIB_LIBA52_ADEC} -la52"
+     ],[])
+fi
+
 dnl
 dnl  Linux framebuffer module
 dnl
@@ -912,6 +1083,16 @@ AC_ARG_ENABLE(fb,
       PLUGINS="${PLUGINS} fb"
     fi ])
 
+dnl
+dnl  Linux MGA module
+dnl
+AC_ARG_ENABLE(mga,
+  [  --enable-mga            Linux kernel Matrox support (default disabled)],
+  [ if test x$enable_mga = xyes
+    then
+      PLUGINS="${PLUGINS} mga xmga"
+    fi ])
+
 dnl
 dnl  GGI module
 dnl
@@ -922,9 +1103,9 @@ AC_ARG_WITH(ggi,
       PLUGINS="${PLUGINS} ggi"
       if test "x$withval" != "xyes"
       then
-        LIB_GGI="-l"$withval
+        LIB_GGI="${LIB_GGI} -l$withval"
       else
-        LIB_GGI="-lggi"
+        LIB_GGI="${LIB_GGI} -lggi"
       fi
     fi ])
 
@@ -959,8 +1140,8 @@ then
   if test x${SDL_CONFIG} != xno
   then
     PLUGINS="${PLUGINS} sdl"
-    CFLAGS_SDL="`${SDL_CONFIG} --cflags`"
-    LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
+    CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`"
+    LIB_SDL="${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,
@@ -988,24 +1169,24 @@ dnl
 dnl  Windows DirectX module
 dnl
 AC_ARG_ENABLE(directx,
-  [  --disable-directx       Windows DirectX support (default enabled on WIN32)])
+  [  --disable-directx       Win32 DirectX support (default enabled on Win32)])
 if test "x$enableval" != "xno"
 then
-  if test $SYS = mingw32
+  if test x$SYS = xmingw32
   then
     AC_ARG_WITH(directx-path, 
-    [  --with-directx-path=path Windows DirectX headers and libraries])
+    [  --with-directx-path=path Win32 DirectX headers and libraries])
     if test "x$with_directx_path" = "x"
     then
       AC_CHECK_HEADERS(directx.h,
       [ PLUGINS="${PLUGINS} directx"
-        LIB_DIRECTX="-lgdi32 -ldxguid" ])
+        LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ])
     else
       AC_MSG_CHECKING(for directX headers in ${withval})
       if test -f ${withval}/include/directx.h
       then
         PLUGINS="${PLUGINS} directx"
-        LIB_DIRECTX="-L${withval}/lib -lgdi32 -ldxguid"
+        LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32"
         INCLUDE="${INCLUDE} -I${withval}/include"
         AC_MSG_RESULT(yes)
       else
@@ -1016,6 +1197,27 @@ then
   fi
 fi
 
+dnl
+dnl  win32 waveOut plugin
+dnl
+AC_ARG_ENABLE(waveout,
+  [  --disable-waveout       Win32 waveOut module (default enabled on Win32)])
+if ((test "x$enableval" != "xno") && (test x$SYS = xmingw32))
+  then
+    PLUGINS="${PLUGINS} waveout"
+    LIB_WAVEOUT="-lwinmm"
+fi
+
+dnl
+dnl  Windows MFC interface module
+dnl
+AC_ARG_ENABLE(win32,
+  [  --enable-win32          Win32 interface support (default disabled)],
+  [ if test "x$enableval" != "xno"
+    then
+      PLUGINS="${PLUGINS} win32"
+    fi ])
+
 dnl
 dnl  Glide module
 dnl
@@ -1026,10 +1228,11 @@ AC_ARG_WITH(glide,
       PLUGINS="${PLUGINS} glide"
       if test "x$withval" != "xyes"
       then
-        LIB_GLIDE="-l"$withval" -lm"
+        LIB_GLIDE="${LIB_GLIDE} -l$withval -lm"
       else
-        LIB_GLIDE="-lglide2x -lm"
+        LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm"
       fi
+      CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide"
     fi ])
 
 dnl
@@ -1039,7 +1242,7 @@ AC_ARG_ENABLE(ncurses,
   [  --enable-ncurses        ncurses interface support (default disabled)],
   [if test x$enable_ncurses = xyes; then
      PLUGINS="${PLUGINS} ncurses"
-     LIB_NCURSES="-lncurses"
+     LIB_NCURSES="${LIB_NCURSES} -lncurses"
    fi])
 
 dnl
@@ -1050,7 +1253,8 @@ AC_ARG_ENABLE(qt,
   [if test x$enable_qt = xyes; then
      PLUGINS="${PLUGINS} qt"
      ALIASES="${ALIASES} qvlc"
-     LIB_QT="-lqt -L${QTDIR}/lib"
+     LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib"
+     CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include"
      if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc
@@ -1067,7 +1271,9 @@ AC_ARG_ENABLE(kde,
   [if test x$enable_kde = xyes; then
      PLUGINS="${PLUGINS} kde"
      ALIASES="${ALIASES} kvlc"
-     LIB_KDE="-L${KDEDIR}/lib -lkfile"
+     LIB_KDE="${LIB_KDE} -L${KDEDIR}/lib -lkfile"
+     CFLAGS_KDE="${CFLAGS_KDE} -I/usr/include/kde -I/usr/include/qt"
+     CFLAGS_KDE="${CFLAGS_KDE} -I${KDEDIR}/include -I${QTDIR}/include"
      if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc
@@ -1086,8 +1292,8 @@ AC_ARG_ENABLE(gnome,
     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,,'`"
+       CFLAGS_GNOME="${CFLAGS_GNOME} `${GNOME_CONFIG} --cflags gtk gnomeui`"
+       LIB_GNOME="${LIB_GNOME} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"
     fi
     # now look for the gnome.h header
     saved_CPPFLAGS=$CPPFLAGS
@@ -1121,19 +1327,23 @@ then
   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,,'`"
+    if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null
+    then
+      AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.])
+    fi
+    CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`"
+    LIB_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."
+  ac_cv_gtk_headers=yes
+  AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [
+    ac_cv_gtk_headers=no
+    echo "Cannot find gtk development headers."
   ])
-  if test -z $FOUND; then
+  if test "x$ac_cv_gtk_headers" = xyes
+  then
     PLUGINS="${PLUGINS} gtk"
     ALIASES="${ALIASES} gvlc"
   fi
@@ -1147,7 +1357,7 @@ dnl
 AC_ARG_ENABLE(x11,
   [  --disable-x11           X11 support (default enabled)])
 if test x$enable_x11 != xno &&
-  (test $SYS != mingw32 || test x$enable_x11 = xyes); then
+  (test x$SYS != xmingw32 || test x$enable_x11 = xyes); then
   if test x$x_includes = xNONE; then
     x_includes=/usr/X11R6/include
   fi
@@ -1157,11 +1367,11 @@ if test x$enable_x11 != xno &&
   saved_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -I$x_includes"
   AC_CHECK_HEADERS(X11/Xlib.h, [
-    #PLUGINS="${PLUGINS} x11"
-    LIB_X11="-L$x_libraries -lX11 -lXext"
-    CFLAGS_X11="-I$x_includes"
-  ]
-  CPPFLAGS=$saved_CPPFLAGS)
+    PLUGINS="${PLUGINS} x11"
+    LIB_X11="${LIB_X11} -L$x_libraries -lX11 -lXext"
+    CFLAGS_X11="${CFLAGS_X11} -I$x_includes"
+  ])
+  CPPFLAGS=$saved_CPPFLAGS
 fi
 
 dnl
@@ -1171,7 +1381,7 @@ dnl
 AC_ARG_ENABLE(xvideo,
   [  --disable-xvideo        XVideo support (default enabled)])
 if test x$enable_xvideo != xno &&
-  (test $SYS != mingw32 || test x$enable_xvideo = xyes); then
+  (test x$SYS != xmingw32 || test x$enable_xvideo = xyes); then
   if test x$x_includes = xNONE; then
     x_includes=/usr/X11R6/include
   fi
@@ -1181,13 +1391,37 @@ if test x$enable_xvideo != xno &&
   saved_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -I$x_includes"
   AC_CHECK_HEADERS(X11/extensions/Xv.h, [
-    BUILTINS="${BUILTINS} xvideo"
-    LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
-    CFLAGS_XVIDEO="-I$x_includes"
+    saved_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
+    AC_CHECK_LIB(Xv_pic,XvSetPortAttribute,
+      # We have Xv_pic, that's good, we can build an xvideo.so plugin !
+      PLUGINS="${PLUGINS} xvideo"
+      LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv_pic"
+      CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes",
+      # We don't have Xv_pic, let's make xvideo.a as builtin
+      BUILTINS="${BUILTINS} xvideo"
+      LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv"
+      CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes")
+    CFLAGS=$saved_CFLAGS
   ]
   CPPFLAGS=$saved_CPPFLAGS)
 fi
 
+dnl
+dnl  Lirc plugin
+dnl
+AC_ARG_ENABLE(lirc,
+  [  --enable-lirc           lirc support (default disabled)])
+if test x$enable_lirc = xyes
+then
+  AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false")
+  if test x$have_lirc = xtrue
+  then
+    PLUGINS="${PLUGINS} lirc"
+    LIB_LIRC="${LIB_LIRC} -llirc_client"
+  fi
+fi
+
 dnl
 dnl  ALSA module
 dnl
@@ -1200,7 +1434,7 @@ AC_ARG_ENABLE(alsa,
      if test x$have_alsa = xtrue
      then
        PLUGINS="${PLUGINS} alsa"
-       LIB_ALSA="-lasound"
+       LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl"
      fi
    fi])
 
@@ -1218,6 +1452,31 @@ AC_ARG_ENABLE(plugins,
      PLUGINS=
    fi])
 
+dnl
+dnl  DLLs - used for Win32 package build
+dnl
+DLL_PATH=.
+AC_ARG_WITH(dll-path,
+  [  --with-dll-path=path    Path to Win32 DLLs (default search in \$PWD)],
+  [ if test "x$withval" != "xno"
+    then
+      DLL_PATH=$withval
+    fi ])
+
+dnl
+dnl  Stuff used by the program
+dnl
+AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VLC_VERSION $VLC_CODENAME Copyright 1996-2001 VideoLAN\n")
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VLC_VERSION $VLC_CODENAME - (c) 1996-2002 VideoLAN")
+
+VLC_SYMBOL="`echo ${VLC_VERSION} | tr .- __`"
+AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__MODULE_$VLC_SYMBOL")
+AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $VLC_SYMBOL)
+
+DATA_PATH="${ac_tool_prefix}/share/videolan"
+AC_SUBST(DATA_PATH)
+PLUGIN_PATH="${ac_tool_prefix}/share/videolan"
+AC_SUBST(PLUGIN_PATH)
 
 dnl 
 dnl  Configuration is finished
@@ -1227,7 +1486,6 @@ AC_SUBST(ARCH)
 AC_SUBST(PLUGINS)
 AC_SUBST(BUILTINS)
 AC_SUBST(ALIASES)
-AC_SUBST(DEFINE)
 AC_SUBST(INCLUDE)
 AC_SUBST(DEBUG)
 AC_SUBST(ASM)
@@ -1237,67 +1495,84 @@ AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
 AC_SUBST(TUNING)
 AC_SUBST(RELEASE)
-AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
+AC_SUBST(DLL_PATH)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
+AC_SUBST(VCD_DEVICE)
+AC_SUBST(DVD_DEVICE)
 
-AC_SUBST(LCFLAGS)
-AC_SUBST(PLCFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(PLDFLAGS)
 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_FILTER_DISTORT)
 AC_SUBST(LIB_GGI)
 AC_SUBST(LIB_GLIDE)
 AC_SUBST(LIB_GNOME)
 AC_SUBST(LIB_GTK)
+AC_SUBST(LIB_IDCTALTIVEC)
 AC_SUBST(LIB_IMDCT)
 AC_SUBST(LIB_IMDCT3DN)
 AC_SUBST(LIB_IMDCTSSE)
 AC_SUBST(LIB_KDE)
+AC_SUBST(LIB_LIBA52_ADEC)
 AC_SUBST(LIB_LIBDVDCSS)
+AC_SUBST(LIB_LIBDVDREAD)
+AC_SUBST(LIB_LIRC)
 AC_SUBST(LIB_MACOSX)
 AC_SUBST(LIB_MAD)
+AC_SUBST(LIB_MOTIONALTIVEC)
 AC_SUBST(LIB_MPEG_TS)
 AC_SUBST(LIB_NCURSES)
 AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_RC)
 AC_SUBST(LIB_SDL)
+AC_SUBST(LIB_WAVEOUT)
+AC_SUBST(LIB_WIN32)
 AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 
 AC_SUBST(CFLAGS_VLC)
-AC_SUBST(CFLAGS_ALTIVEC)
+AC_SUBST(CFLAGS_ARTS)
 AC_SUBST(CFLAGS_DVD)
 AC_SUBST(CFLAGS_DVDREAD)
-AC_SUBST(CFLAGS_LIBDVDCSS)
-AC_SUBST(CFLAGS_ARTS)
 AC_SUBST(CFLAGS_ESD)
+AC_SUBST(CFLAGS_GLIDE)
+AC_SUBST(CFLAGS_GNOME)
 AC_SUBST(CFLAGS_GTK)
+AC_SUBST(CFLAGS_KDE)
+AC_SUBST(CFLAGS_IDCTALTIVEC)
+AC_SUBST(CFLAGS_LIBDVDCSS)
+AC_SUBST(CFLAGS_MACOSX)
 AC_SUBST(CFLAGS_MAD)
+AC_SUBST(CFLAGS_MOTIONALTIVEC)
+AC_SUBST(CFLAGS_OPTIM)
+AC_SUBST(CFLAGS_OPTIM_NODEBUG)
+AC_SUBST(CFLAGS_QT)
 AC_SUBST(CFLAGS_SDL)
+AC_SUBST(CFLAGS_WIN32)
 AC_SUBST(CFLAGS_X11)
 AC_SUBST(CFLAGS_XVIDEO)
 
-AC_SUBST(OBJ_DVD)
-AC_SUBST(OBJ_LIBDVDCSS)
+AC_SUBST(SRC_DVD_EXTRA)
+AC_SUBST(SRC_DVDCSS_EXTRA)
 
+AC_SUBST(NEED_GETOPT)
 AC_SUBST(NEED_LIBDVDCSS)
 
-AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in])
+AC_OUTPUT([Makefile.opts po/Makefile.in])
 
 echo "
 global configuration