]> git.sesse.net Git - vlc/blobdiff - configure.ac
* modules/access/dvdread, modules/access/dvdread.c:
[vlc] / configure.ac
index e89ee63b9a033e0ae542e356ccf0d503e164d3df..e02b0a8375d27b7c4083b0a493ab27231c4126f4 100644 (file)
@@ -1,7 +1,7 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.181 2004/02/11 08:50:04 zorglub Exp $
-
-AC_INIT(vlc,0.7.1-test1)
+dnl $Id$
+AC_INIT(vlc,0.7.3-svn)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Bond"
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.7.1-test1)
+AM_INIT_AUTOMAKE(vlc,0.7.3-svn)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -28,6 +28,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_CXX
+AC_PROG_CXXCPP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
@@ -52,6 +53,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
 AC_CHECK_TOOL(AR, ar, :)
 AC_CHECK_TOOL(LD, ld, :)
+AC_CHECK_TOOL(UPX, upx, "")
 
 dnl Sam, if you think I didn't see that... --Meuuh
 dnl AM_PROG_LIBTOOL
@@ -145,7 +147,8 @@ case "${target_os}" in
         # add ws2_32 for closesocket, select, recv
         CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
         AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
-        AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http httpd stream_out_standard],[-lws2_32])
+        AX_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
+        AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet netsync],[-lws2_32])
     fi
     ;;
   *nto*)
@@ -203,6 +206,14 @@ fi
 AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
 XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
 
+AC_ARG_ENABLE(utf8,
+  [  --enable-utf8           unicode utf8 support (default enabled on darwin/beos/win32)])
+if test "${enable_utf8}" = "yes" || (test "${enable_utf8}" != "no" && (test "${SYS}" = "mingw32" || test "${SYS}" = "beos" || test "${SYS}" = "darwin" ) )
+then
+  AC_DEFINE(ENABLE_UTF8, 1,
+            Define if you want utf8 support)
+fi
+
 AC_MSG_CHECKING(for suffix of libraries)
 AC_MSG_RESULT(${LIBEXT})
 
@@ -277,12 +288,13 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd
 dnl Check for system libs needed
 need_libc=false
 
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf)
 
 dnl Check for usual libc functions
 AC_CHECK_FUNCS(strdup strndup atof lseek)
 AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
 AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
+AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
 
 dnl Check for setlocal and langinfo
 AC_CHECK_FUNCS(setlocale)
@@ -308,16 +320,16 @@ AC_CHECK_FUNCS(connect,,[
 
 AC_CHECK_FUNCS(send,,[
   AC_CHECK_LIB(socket,send,[
-    AX_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap httpd access_output_udp stream_out_standard],[-lsocket])
+    AX_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard],[-lsocket])
   ])
 ])
 
 AC_CHECK_FUNCS(gethostbyname,,[
   AC_CHECK_LIB(nsl,gethostbyname,[
-    AX_ADD_LDFLAGS([cddax ipv4 httpd vlc],[-lnsl])
+    AX_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl])
   ],[
     AC_CHECK_LIB(bind,gethostbyname,[
-      AX_ADD_LDFLAGS([ipv4 access_mms httpd],[-lbind])
+      AX_ADD_LDFLAGS([ipv4 access_mms],[-lbind])
     ])
   ])
 ])
@@ -356,7 +368,7 @@ fi
 
 AC_CHECK_FUNCS(inet_aton,,[
   AC_CHECK_LIB(resolv,inet_aton,[
-    AX_ADD_LDFLAGS([ipv4 httpd],[-lresolv])
+    AX_ADD_LDFLAGS([ipv4 vlc],[-lresolv])
   ])
 ])
 
@@ -558,11 +570,11 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
   AC_MSG_RESULT(no)])
 
 dnl Check for headers
-AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
+AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
 if test "${SYS}" != "mingw32"; then
-AC_CHECK_HEADERS(machine/param.h sys/shm.h)
+AC_CHECK_HEADERS(machine/param.h sys/shm.h altivec.h)
 AC_CHECK_HEADERS(linux/version.h)
 fi # end "${SYS}" != "mingw32"
 
@@ -698,11 +710,19 @@ if test "${ac_cv_c_pipe}" != "no"; then
 fi
 
 dnl Check for various optimization flags
+AC_CACHE_CHECK([if \$CC accepts -Os],
+    [ac_cv_c_os],
+    [CFLAGS="${CFLAGS_save} -Os"
+     AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)])
+if test "${ac_cv_c_os}" != "no" -a "${target_cpu}" = "mipsel"; then
+    CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os"
+fi
+
 AC_CACHE_CHECK([if \$CC accepts -O3],
     [ac_cv_c_o3],
     [CFLAGS="${CFLAGS_save} -O3"
      AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
-if test "${ac_cv_c_o3}" != "no"; then
+if test "${ac_cv_c_o3}" != "no" -a "${target_cpu}" != "mipsel"; then
     CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
 fi
 
@@ -710,17 +730,17 @@ AC_CACHE_CHECK([if \$CC accepts -O2],
     [ac_cv_c_o2],
     [CFLAGS="${CFLAGS_save} -O2"
      AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
-if test "${ac_cv_c_o2}" != "no"; then
+if test "${ac_cv_c_o2}" != "no" -a "${target_cpu}" != "mipsel"; then
     if test "${ac_cv_c_o3}" = "no"; then
         CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
     fi
     CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
-else
+else 
     AC_CACHE_CHECK([if \$CC accepts -O],
         [ac_cv_c_o],
         [CFLAGS="${CFLAGS_save} -O"
          AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
-    if test "${ac_cv_c_o}" != "no"; then
+    if test "${ac_cv_c_o}" != "no" -a "${target_cpu}" != "mipsel"; then
         if test "${ac_cv_c_o3}" = "no"; then
             CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
        fi
@@ -872,8 +892,8 @@ test "${enable_cprof}" != "yes" && enable_cprof="no"
 dnl
 dnl  default modules
 dnl
-AX_ADD_PLUGINS([dummy rc logger gestures memcpy hotkeys])
-AX_ADD_PLUGINS([mpgv mpga m4v mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff])
+AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
+AX_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg])
 AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
 AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
 AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
@@ -881,13 +901,12 @@ AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_re
 AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
 AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
 AX_ADD_PLUGINS([aout_file])
-#AX_ADD_PLUGINS([scope])
 AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
-AX_ADD_PLUGINS([id3 m3u playlist export])
+AX_ADD_PLUGINS([m3u playlist export sgimb])
 AX_ADD_PLUGINS([rawvideo])
-AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au])
+AX_ADD_PLUGINS([wav araw demuxsub adpcm a52sys dtssys au])
 AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
-AX_ADD_PLUGINS([access_ftp access_directory sap httpd http])
+AX_ADD_PLUGINS([access_ftp access_directory sap http])
 
 dnl
 dnl  Switch to enable a version of VLC where most modules will be builtin
@@ -960,7 +979,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
     [CFLAGS="${CFLAGS_save}"
      AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
                     ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
-if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "mingw32"; then
+if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "solaris"; then
   AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
   ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
 fi
@@ -982,6 +1001,7 @@ if test "${ac_cv_altivec_inline}" != "no"; then
     AX_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}])
     AX_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}])
     AX_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}])
+    AX_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
     AX_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}])
   fi
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
@@ -989,14 +1009,27 @@ fi
 
 AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
     [ac_cv_c_altivec],
-    [CFLAGS="${CFLAGS_save} -faltivec"
-     # Darwin test
-     AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
-        ac_cv_c_altivec=-faltivec, [
-        # Linux/PPC test
-        CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec"
-        AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
-            [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
+    [# Darwin test
+     CFLAGS="${CFLAGS_save} -faltivec"
+     AC_TRY_COMPILE([],
+       [vec_ld(0, (unsigned char *)0);],
+       [ac_cv_c_altivec="-faltivec"],
+       [# Linux/PPC test
+        CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -maltivec -mabi=altivec"
+        AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H
+                        #include <altivec.h>
+                        #endif],
+          [vec_ld(0, (unsigned char *)0);],
+          [ac_cv_c_altivec="-maltivec -mabi=altivec"],
+          [# Linux/PPC test (old GCC versions)
+           CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec"
+           AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H
+                           #include <altivec.h>
+                           #endif],
+             [vec_ld(0, (unsigned char *)0);],
+             [ac_cv_c_altivec="-fvec"],
+             [ac_cv_c_altivec=no])
+           ])
         ])
      CFLAGS="${CFLAGS_save}"])
 if test "${ac_cv_c_altivec}" != "no"; then
@@ -1087,14 +1120,14 @@ AC_ARG_ENABLE(sout,
 if test "${enable_sout}" != "no"
 then
   AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http])
-  AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
-  AX_ADD_PLUGINS([packetizer_mpegvideo])
+  AX_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
+  AX_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
   AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
   AX_ADD_PLUGINS([packetizer_copy])
 
   AX_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp])
-  AX_ADD_PLUGINS([stream_out_duplicate stream_out_display stream_out_gather])
-#  AX_ADD_PLUGINS([stream_out_transrate])
+  AX_ADD_PLUGINS([stream_out_duplicate stream_out_gather])
+#  AX_ADD_PLUGINS([stream_out_transrate stream_out_display])
 
   dnl Ogg and vorbis are handled in their respective section
 fi
@@ -1179,74 +1212,6 @@ if test "${enable_livedotcom}" = "yes"; then
 fi
 
 
-
-dnl
-dnl  DVD module: optionally check for installed libdvdcss
-dnl
-AC_ARG_ENABLE(dvd,
-[  --enable-dvd            DVD input module (default enabled)])
-if test "${enable_dvd}" != "no"
-then
-  AC_ARG_WITH(dvdcss,
-  [    --with-dvdcss=PATH    libdvdcss headers and libraries])
-  AC_ARG_WITH(dvdcss-tree,
-  [    --with-dvdcss-tree=PATH libdvdcss tree for static linking])
-  case "${with_dvdcss}" in
-  ""|yes)
-    if test -z "${with_dvdcss_tree}"
-    then
-      AC_CHECK_HEADERS(dvdcss/dvdcss.h,
-        [ AX_ADD_PLUGINS([dvd])
-          AX_ADD_LDFLAGS([dvd dvdcss],[-ldvdcss])],
-        [ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss=<path/where/libdvdcss/was/installed> for dynamic linking (recommended under Unix) or --with-dvdcss-tree=<path/where/libdvdcss/was/built> for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.])
-          AC_MSG_ERROR([cannot find libdvdcss headers]) ])
-    else
-      AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree})
-      real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`"
-      if test -z "${real_dvdcss_tree}"
-      then
-        dnl  The given directory can't be found
-        AC_MSG_RESULT(no)
-        AC_MSG_ERROR([cannot cd to ${with_dvdcss_tree}])
-      fi
-      if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a"
-      then
-        dnl  Use a custom libdvdcss
-        AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a)
-        AX_ADD_BUILTINS([dvd])
-        AX_ADD_LDFLAGS([dvd dvdcss],[-L${real_dvdcss_tree}/src/.libs -ldvdcss])
-        AX_ADD_CPPFLAGS([dvd],[-I${real_dvdcss_tree}/src])
-      else
-        dnl  The given libdvdcss wasn't built
-        AC_MSG_RESULT(no)
-        AC_MSG_ERROR([cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}])
-      fi
-    fi
-  ;;
-  no)
-    dnl  Compile without dvdcss (dlopen version, works only under Linux)
-    AX_ADD_PLUGINS([dvd])
-    AX_ADD_CPPFLAGS([dvd],[-DGOD_DAMN_DMCA])
-    AX_ADD_LDFLAGS([dvd],[-ldl])
-  ;;
-  *)
-    AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss})
-    if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h
-    then
-      dnl  Use ${with_dvdcss}/include/dvdcss/dvdcss.h
-      AC_MSG_RESULT(yes)
-      AX_ADD_PLUGINS([dvd])
-      AX_ADD_LDFLAGS([dvd dvdcss],[-L${with_dvdcss}/lib -ldvdcss])
-      AX_ADD_CPPFLAGS([dvd],[-I${with_dvdcss}/include])
-    else
-      dnl  No libdvdcss could be found, sorry
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h])
-    fi
-  ;;
-  esac
-fi
-
 dnl
 dnl dvdread module: check for libdvdread
 dnl
@@ -1311,77 +1276,12 @@ then
   fi
 fi
 
-dnl
-dnl dvdplay module: check for libdvdplay
-dnl
-AC_ARG_ENABLE(dvdplay,
-[  --enable-dvdplay        dvdplay input module (default enabled)])
-if test "${enable_dvdplay}" != "no"
-then
-  AC_ARG_WITH(dvdplay,
-  [    --with-dvdplay=PATH    libdvdplay headers and libraries])
-  AC_ARG_WITH(dvdplay-tree,
-  [    --with-dvdplay-tree=PATH libdvdplay tree for static linking])
-  if test -z "${with_dvdplay}"
-  then
-    if test -z "${with_dvdplay_tree}"
-    then
-      AC_CHECK_HEADERS(dvdplay/dvdplay.h,[
-          AX_ADD_PLUGINS([dvdplay])
-          AX_ADD_LDFLAGS([dvdplay],[-ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}])
-          AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread}])
-        ],[
-          if test -n "${enable_dvdplay}"
-          then
-            AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.])
-            AC_MSG_ERROR([cannot find libdvdplay headers])
-          fi
-        ])
-    else
-      AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree})
-      real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`"
-      if test -z "${real_dvdplay_tree}"
-      then
-        dnl  The given directory can't be found
-        AC_MSG_RESULT(no)
-        AC_MSG_ERROR([cannot cd to ${with_dvdplay_tree}])
-      fi
-      if test -f "${real_dvdplay_tree}/src/.libs/libdvdplay.a"
-      then
-        dnl  Use a custom libdvdplay
-        AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a)
-        AX_ADD_BUILTINS([dvdplay])
-        AX_ADD_LDFLAGS([dvdplay],[-L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}])
-        AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src])
-      else
-        dnl  The given libdvdplay wasn't built
-        AC_MSG_RESULT(no)
-        AC_MSG_ERROR([cannot find ${real_dvdplay_tree}/src/.libs/libdvdplay.a, make sure you compiled libdvdplay in ${with_dvdplay_tree}])
-      fi
-    fi
-  else
-    AC_MSG_CHECKING(for dvdplay headers in ${with_dvdplay})
-    if test -f "${with_dvdplay}/include/dvdplay/dvdplay.h"
-    then
-      dnl  Use ${with_dvdplay}/include/dvdplay/dvdplay.h
-      AC_MSG_RESULT(yes)
-      AX_ADD_PLUGINS([dvdplay])
-      AX_ADD_LDFLAGS([dvdplay],[-L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}])
-      AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${with_dvdplay}/include])
-    else
-      dnl  No libdvdplay could be found, sorry
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([cannot find ${with_dvdplay}/include/dvdplay/dvdplay.h])
-    fi
-  fi
-fi
-
 dnl
 dnl  libdvdnav plugin
 dnl
 AC_ARG_ENABLE(dvdnav,
   [  --enable-dvdnav         dvdnav input module (default enabled)])
-if test "${enable_caca}" != "no"
+if test "${enable_dvdnav}" != "no"
 then
   DVDNAV_PATH="${PATH}"
   AC_ARG_WITH(dvdnav-config-path,
@@ -1431,8 +1331,8 @@ then
     if test -z "${with_dvbpsi_tree}"
     then
       AC_CHECK_HEADERS(dvbpsi/dr.h,
-        [ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2])
-          AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-ldvbpsi]) ],
+        [ AX_ADD_PLUGINS([mux_ts ts])
+          AX_ADD_LDFLAGS([mux_ts ts],[-ldvbpsi]) ],
         [  AC_MSG_WARN([cannot find libdvbpsi headers]) ],
         [#if defined( HAVE_STDINT_H )
 #   include <stdint.h>
@@ -1456,9 +1356,9 @@ then
       then
         dnl  Use a custom libdvbpsi
         AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
-        AX_ADD_BUILTINS([ts_dvbpsi mux_ts_dvbpsi ts2])
-        AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-I${real_dvbpsi_tree}/src])
-        AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
+        AX_ADD_BUILTINS([mux_ts ts])
+        AX_ADD_CPPFLAGS([mux_ts ts],[-I${real_dvbpsi_tree}/src])
+        AX_ADD_LDFLAGS([mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
       else
         dnl  The given libdvbpsi wasn't built
         AC_MSG_RESULT(no)
@@ -1481,9 +1381,9 @@ then
     fi
     CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
     AC_CHECK_HEADERS([dvbpsi/dr.h],[
-      AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2])
-      AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${CPPFLAGS_test}])
-      AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${LDFLAGS_test} -ldvbpsi])
+      AX_ADD_PLUGINS([mux_ts ts])
+      AX_ADD_CPPFLAGS([mux_ts ts],[${CPPFLAGS_test}])
+      AX_ADD_LDFLAGS([mux_ts ts],[${LDFLAGS_test} -ldvbpsi])
 
     ],[
       if test -n "${enable_dvbpsi}"
@@ -1527,56 +1427,59 @@ then
   AX_ADD_PLUGINS([pvr])
 fi
 
-dnl
-dnl  VCDX and CDDAX modules
-dnl
-AC_ARG_ENABLE(libcdio,
-  [  --enable-libcdio        CDDA support via libcdio (default enabled)])
-
-AC_ARG_ENABLE(libcddb,
-  [  --enable-libcddb        CDDB support for CDDAX (default enabled)])
-
-AC_ARG_ENABLE(vcdx,
-  [  --enable-vcdx           VCD support with Navigation (default enabled)])
-
-AC_ARG_ENABLE(cdda,           
-  [  --enable-cdda            CDDA plugin support (default enabled)])
-
-if test "${enable_cddax}" != "no"
-then
-  PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
-   [enable_cddax="no"
-    AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
-    AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
-    AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
-    AX_ADD_PLUGINS([cddax])], 
-   [AC_MSG_WARN(libcdio library not found)
-   HAVE_CDDAX=no])
-
-  if test x$enable_libcddb != no; then
-    PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
-      HAVE_LIBCDDB=yes 
-      AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
-      AX_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
-      AX_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
-      ],
-      [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) 
-      HAVE_LIBCDDB=no])
-  fi
-
-  if test "${enable_vcdx}" != "no"
-  then
-    PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
-     [enable_vcd="no"
-      AC_DEFINE(HAVE_VCDX, [], 
-      [Define for the VCD plugin using libcdio/libvcdinfo])
-      AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
-      AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
-      AX_ADD_PLUGINS([vcdx])], 
-     [AC_MSG_WARN(vcdinfo library not found)
-     HAVE_VCDX=no])
-  fi
-fi
+dnl dnl
+dnl dnl  VCDX and CDDAX modules
+dnl dnl
+dnl AC_ARG_ENABLE(libcdio,
+dnl   [  --enable-libcdio        CDDA support via libcdio (default enabled)])
+dnl 
+dnl AC_ARG_ENABLE(libcddb,
+dnl   [  --enable-libcddb        CDDB support for CDDAX (default enabled)])
+dnl 
+dnl AC_ARG_ENABLE(vcdx,
+dnl   [  --enable-vcdx           VCD support with Navigation (default enabled)])
+dnl 
+dnl AC_ARG_ENABLE(cdda,           
+dnl   [  --enable-cdda           CDDA plugin support (default enabled)])
+dnl 
+dnl AC_ARG_ENABLE(cddax,
+dnl   [  --enable-cddax          CDDAX plugin support (default enabled)])
+dnl 
+dnl if test "${enable_cddax}" != "no"
+dnl then
+dnl   PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
+dnl    [enable_cddax="no"
+dnl     AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
+dnl     AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
+dnl     AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
+dnl     AX_ADD_PLUGINS([cddax])], 
+dnl    [AC_MSG_WARN(libcdio library not found)
+dnl    HAVE_CDDAX=no])
+dnl 
+dnl   if test x$enable_libcddb != no; then
+dnl     PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
+dnl       HAVE_LIBCDDB=yes 
+dnl       AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
+dnl       AX_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
+dnl       AX_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
+dnl       ],
+dnl       [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) 
+dnl       HAVE_LIBCDDB=no])
+dnl   fi
+dnl 
+dnl   if test "${enable_vcdx}" != "no"
+dnl   then
+dnl     PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
+dnl      [enable_vcd="no"
+dnl       AC_DEFINE(HAVE_VCDX, [], 
+dnl       [Define for the VCD plugin using libcdio/libvcdinfo])
+dnl       AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
+dnl       AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+dnl       AX_ADD_PLUGINS([vcdx])], 
+dnl      [AC_MSG_WARN(vcdinfo library not found)
+dnl      HAVE_VCDX=no])
+dnl   fi
+dnl fi
 
 dnl
 dnl  VCD module
@@ -1620,7 +1523,7 @@ then
   if test "${SYS}" = "darwin"
   then
     AX_ADD_PLUGINS([vcd cdda])
-    AX_ADD_LDFLAGS([vcd cdda],[-framework IOKit -framework CoreFoundation])
+    AX_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation])
   fi
 fi
 
@@ -1769,12 +1672,12 @@ then
       AC_MSG_ERROR([${with_mad_tree} directory doesn't exist])
     fi
     dnl  Use a custom libmad
-    AC_MSG_CHECKING(for mad.h in ${real_mad_tree}/libmad)
-    if test -f ${real_mad_tree}/libmad/mad.h
+    AC_MSG_CHECKING(for mad.h in ${real_mad_tree})
+    if test -f ${real_mad_tree}/mad.h
     then
       AC_MSG_RESULT(yes)
-      AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}/libmad])
-      AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/libmad/.libs])
+      AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}])
+      AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/.libs])
       LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}"
       AC_CHECK_LIB(mad, mad_bit_init, [
         AX_ADD_BUILTINS([mpgatofixed32])
@@ -1801,12 +1704,12 @@ then
 fi
 
 dnl
-dnl   libid3tag support
+dnl   libid3tag support (FIXME!!! doesn't work with new input)
 dnl
-AC_CHECK_HEADERS(id3tag.h, [
-  AC_CHECK_HEADERS(zlib.h, [
-    AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
-    AX_ADD_PLUGINS([id3tag])]) ])
+dnl AC_CHECK_HEADERS(id3tag.h, [
+dnl   AC_CHECK_HEADERS(zlib.h, [
+dnl     AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
+dnl     AX_ADD_PLUGINS([id3tag])]) ])
 
 dnl
 dnl  ffmpeg decoder/demuxer plugin
@@ -1873,7 +1776,7 @@ then
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}])
     fi
-    if ! grep -q "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
+    if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
       dnl  The given libavcodec wasn't built with --enable-pp
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp])
@@ -1882,7 +1785,7 @@ then
     AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
     AX_ADD_BUILTINS([ffmpeg stream_out_transcode])
     AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec])
-    AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec])
+    AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
 
     if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
       AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.])
@@ -1893,7 +1796,7 @@ then
     dnl  XXX: we don't link with -lavcodec a 2nd time because the OS X
     dnl       linker would miserably barf on multiple definitions.
     AX_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec])
-    AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec])
+    AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
   fi
 fi
 
@@ -1921,7 +1824,7 @@ then
       dnl  Use a custom faad
       AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
       AX_ADD_BUILTINS([faad])
-      AX_ADD_LDFLAGS([faad],[-L${real_faad_tree}/libfaad/.libs -lfaad])
+      AX_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a])
       AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include])
     else
       dnl  The given libfaad wasn't built
@@ -1936,7 +1839,10 @@ then
     AC_CHECK_LIB(faad, faacDecOpen, [
       AX_ADD_PLUGINS([faad])
       AX_ADD_LDFLAGS([faad],[-lfaad]) ],
-      [ AC_MSG_ERROR([Cannot find libfaad library...]) ])
+      AC_CHECK_LIB(faad, NeAACDecOpen, [
+        AX_ADD_PLUGINS([faad])
+        AX_ADD_LDFLAGS([faad],[-lfaad]) ],
+        [ AC_MSG_ERROR([Cannot find libfaad library...]) ]))
     LDFLAGS="${LDFLAGS_save}"
     CPPFLAGS="${CPPFLAGS_save}"
   fi
@@ -2111,7 +2017,7 @@ AC_ARG_ENABLE(dts,
   [  --enable-dts            DTS Coherent Acoustics support with libdts (default enabled)])
 if test "${enable_dts}" != "no"; then
   AC_ARG_WITH(dts-tree,
-    [    --with-dts-tree=PATH  dtsdec tree for static linking ],[],[])
+    [    --with-dts-tree=PATH  libdts tree for static linking ],[],[])
   if test "${with_dts_tree}" != "no" -a -n "${with_dts_tree}"
   then
     real_dts_tree="`cd ${with_dts_tree} 2>/dev/null && pwd`"
@@ -2121,22 +2027,21 @@ if test "${enable_dts}" != "no"; then
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([${with_dts_tree} directory doesn't exist])
     fi
-    dnl  Use a custom dtsdec
+    dnl  Use a custom libdts
     AC_MSG_CHECKING(for dts.h in ${real_dts_tree}/include)
     if test -f ${real_dts_tree}/include/dts.h
     then
       AC_MSG_RESULT(yes)
-      AX_ADD_CPPFLAGS([dtstofloat32],[-I${real_dts_tree}])
-      AX_ADD_LDFLAGS([dtstofloat32],[-L${real_dts_tree}/libdts/.libs])
+      AX_ADD_CPPFLAGS([dtstofloat32],[-I${real_dts_tree}/include])
+      AX_ADD_LDFLAGS([dtstofloat32],[-L${real_dts_tree}/libdts])
       LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}"
       AC_CHECK_LIB(dts, dts_free, [
         AX_ADD_BUILTINS([dtstofloat32])
-        AX_ADD_CPPFLAGS([dtstofloat32],[-DUSE_DTSDEC_TREE])
         AX_ADD_LDFLAGS([dtstofloat32],[-ldts])
         ],[
-        if test -f ${real_dts_tree}/libdts/.libs/libdts.a
+        if test -f ${real_dts_tree}/libdts/libdts.a
         then
-          AC_MSG_ERROR([make sure you have at least dtsdec-0.1.0])
+          AC_MSG_ERROR([make sure you have at least libdts-0.0.2])
         else
           AC_MSG_ERROR([the specified tree hasn't been compiled])
         fi
@@ -2147,16 +2052,18 @@ if test "${enable_dts}" != "no"; then
       AC_MSG_ERROR([the specified tree doesn't have dts.h])
     fi
   else
-    AC_CHECK_HEADERS(dtsdec/dts.h, [
+    LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}"
+    AC_CHECK_HEADERS(dts.h, [
       AC_CHECK_LIB(dts, dts_free, [
         AX_ADD_PLUGINS([dtstofloat32])
         AX_ADD_LDFLAGS([dtstofloat32],[-ldts])
       ],[
         if test "${enable_dts}" = "yes"; then
-          AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.])
+          AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html])
         fi
       ])
     ])
+    LDFLAGS="${LDFLAGS_save}"
   fi
 fi
 
@@ -2275,8 +2182,19 @@ AC_ARG_ENABLE(speex,
 if test "${enable_speex}" != "no"
 then
   AC_CHECK_HEADERS(speex.h, [
-    AX_ADD_PLUGINS([speex])
-    AX_ADD_LDFLAGS([speex],[-lspeex]) ],[])
+    AC_MSG_CHECKING(for libspeex version > 1.1.0)
+    AC_EGREP_CPP(yes,
+      [#include <speex.h>
+       #ifdef SPEEX_SET_SUBMODE_ENCODING
+       yes
+       #endif],
+      [ AC_MSG_RESULT([yes])
+        AX_ADD_PLUGINS([speex])
+        AX_ADD_LDFLAGS([speex],[-lspeex]) ],
+      [ AC_MSG_RESULT([no])
+        AC_MSG_WARN([Your libspeex is too old, please get the development
+                     version.]) ] )
+    ],[])
 fi
 
 dnl
@@ -2336,6 +2254,16 @@ AX_ADD_LDFLAGS([subsdec],[${LIBICONV}])
 AX_ADD_CPPFLAGS([subsdec],[${INCICONV}])
 AX_ADD_PLUGINS([subsdec])
 
+dnl
+dnl  CMML plugin
+dnl
+AC_ARG_ENABLE(cmml,
+  [  --enable-cmml           CMML support (default enabled)])
+if test "${enable_cmml}" != "no"
+then
+  AX_ADD_PLUGINS([cmml])
+fi
+
 
 dnl
 dnl  Video Filters
@@ -2348,7 +2276,7 @@ AC_CHECK_HEADERS(png.h, [
     AX_ADD_LDFLAGS([logo],[-lpng -lz])
     AX_ADD_PLUGINS([logo])
     AX_ADD_LDFLAGS([svcdsub],[-lpng -lz])
-    AX_ADD_LDFLAGS([cvdsub],[-lpng -lz])
+    AX_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm])
     AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])])
 
 dnl
@@ -2389,14 +2317,6 @@ if test "${enable_x11}" != "no" &&
     AX_ADD_PLUGINS([x11])
     AX_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext])
     AX_ADD_CPPFLAGS([x11],[-I${x_includes}])
-    AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [
-      CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
-      AC_CHECK_LIB(Xinerama, XineramaQueryExtension, [
-        AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
-        AX_ADD_LDFLAGS([x11],[-lXinerama])
-      ])
-      CFLAGS="${CFLAGS_save}"
-    ])
   ])
   CPPFLAGS="${CPPFLAGS_save}"
 fi
@@ -2412,32 +2332,58 @@ if test "${enable_xvideo}" != "no" &&
   CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
   AC_CHECK_HEADERS(X11/extensions/Xv.h, [
     CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
-    AC_CHECK_LIB(Xv_pic,XvPutImage,
-      # We have Xv_pic, that's good, we can build an xvideo.so plugin !
-      AX_ADD_PLUGINS([xvideo])
-      AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic])
-      AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]),
-      AC_CHECK_LIB(Xv,XvPutImage,[
-        # We don't have Xv_pic, but we have Xv, let's make xvideo.a as builtin
+    AC_CHECK_LIB(Xv,XvPutImage,[
+      # If libXv.so is available, xvideo can be a plugin. Otherwise, we
+      # test for libXv_pic.
+      if test -f /usr/X11R6/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then
         AX_ADD_PLUGINS([xvideo])
-        AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
         AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
-      ],[
-        # Otherwise... well, do nothing.
-        :
-      ])
-    )
-    AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[
-      AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
-        AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
-        AX_ADD_LDFLAGS([xvideo],[-lXinerama])
-      ])
+        AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
+      else
+        AC_CHECK_LIB(Xv_pic,XvPutImage,[
+          AX_ADD_PLUGINS([xvideo])
+          AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
+          AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic])
+        ],[
+          AX_ADD_BUILTINS([xvideo])
+          AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
+          AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
+        ])
+      fi
     ])
     CFLAGS="${CFLAGS_save}"
   ]
   CPPFLAGS="${CPPFLAGS_save}")
 fi
 
+dnl
+dnl  Check for the Xinerama extension
+dnl
+if test "${enable_xvideo}" != "no" &&
+  (test "${SYS}" != "mingw32" || test "${enable_xvideo}" = "yes"); then
+  ac_cv_have_xinerama="no"
+  CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
+  CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
+  AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[
+    AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[
+      AX_ADD_LDFLAGS([xvideo],[-lXinerama_pic])
+      AX_ADD_LDFLAGS([x11],[-lXinerama_pic])
+      ac_cv_have_xinerama="yes"
+    ],[
+      AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
+        AX_ADD_LDFLAGS([xvideo],[-lXinerama])
+        AX_ADD_LDFLAGS([x11],[-lXinerama])
+        ac_cv_have_xinerama="yes"
+      ])
+    ])
+  ])
+  if test "${ac_cv_have_xinerama}" = "yes"; then
+    AC_DEFINE(HAVE_XINERAMA, 1, [Define this if you have libXinerama installed])
+  fi
+  CFLAGS="${CFLAGS_save}"
+  CPPFLAGS="${CPPFLAGS_save}"
+fi
+
 dnl
 dnl  SDL module
 dnl
@@ -2530,7 +2476,6 @@ then
     AX_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs` ${LIBICONV}])
     AC_CHECK_HEADERS(Carbon/Carbon.h,
       [AX_ADD_LDFLAGS([freetype],[-framework Carbon])])
-    CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
   elif test "${enable_freetype}" =  "yes"
   then
     AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
@@ -2558,6 +2503,22 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
   fi
 fi
 
+dnl
+dnl  SVG module
+dnl
+AC_ARG_ENABLE(svg,
+  [  --enable-svg       SVG support (default disabled)])
+if test "${enable_svg}" == "yes"
+then
+  PKG_CHECK_MODULES(SVG, 
+       librsvg-2.0 >= 2.5.0,
+       [
+         AX_ADD_LDFLAGS([svg],[$SVG_LIBS])
+         AX_ADD_CFLAGS([svg],[$SVG_CFLAGS])
+          AX_ADD_PLUGINS([svg]) ],
+        [AC_MSG_WARN(SVG library not found)])
+fi
+
 dnl
 dnl  Qt Embedded module
 dnl  (disabled by default)
@@ -2585,6 +2546,54 @@ then
   CPPFLAGS="${CPPFLAGS_save}"
 fi
 
+dnl
+dnl  Qt Video output module
+dnl  (disabled by default)
+dnl
+dnl AC_ARG_ENABLE(qt_video,
+dnl   [  --enable-qt_video            QT Video Output support (default disabled)])
+dnl if test "${enable_qt_video}" = "yes"
+dnl then
+dnl  AX_ADD_PLUGINS([qt_video])
+dnl  AX_ADD_LDFLAGS([qt_video],[-L${QTDIR}/lib])
+dnl  LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}"
+dnl   AC_CHECK_LIB(qt-mt,main,[
+dnl    AX_ADD_LDFLAGS([qt_video],[-lqt-mt])
+dnl  ],[
+dnl    AC_CHECK_LIB(qt,main,[
+dnl      AX_ADD_LDFLAGS([qt_video],[-lqt])
+dnl    ])
+dnl  ])
+dnl  NEED_QTE_MAIN=yes
+dnl  LDFLAGS="${LDFLAGS_save}"
+dnl  AX_ADD_CXXFLAGS([qt_video],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include])
+dnl fi
+
+dnl
+dnl Roku HD1000 Video output module
+dnl
+AC_ARG_ENABLE(hd1000v,
+  [  --enable-hd1000v        HD1000 Video Output module (default enabled on HD1000)])
+if test "${enable_hd1000v}" != "no" &&
+  (test "${SYS}" != "mingw32" || test "${enable_hd1000v}" = "yes")
+then
+  AC_LANG_PUSH([C++])
+  AC_CHECK_HEADERS([cascade/graphics/CascadeScreen.h cascade/graphics/CascadeBitmap.h],
+  [
+    can_build_roku="yes"
+  ],
+  [
+    can_build_roku="no"
+    AC_MSG_WARN([Not building Roku HD1000 compatible video output])
+  ])
+  if test "$can_build_roku" = "yes"
+  then
+    AX_ADD_PLUGINS([hd1000v])
+    AX_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad])
+  fi
+  AC_LANG_POP([C++])
+fi
+
 dnl
 dnl  Windows DirectX module
 dnl
@@ -2844,6 +2853,21 @@ then
     ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
 fi
 
+dnl
+dnl  Roku HD1000 audio
+dnl
+AC_ARG_ENABLE(hd1000a,
+  [  --enable-hd1000a        HD1000 audio module (default enabled on HD1000)])
+if test "${enable_hd1000a}" != "no" &&
+  (test "${SYS}" != "mingw32" || test "${enable_hd1000a}" = "yes")
+then
+  AC_LANG_PUSH([C++])
+  AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [
+    AX_ADD_PLUGINS([hd1000a])
+    AC_CHECK_LIB(HDMachineX225,main,AX_ADD_LDFLAGS([hd1000a],[-lHDMachineX225]))  ])
+  AC_LANG_POP([C++])
+fi
+
 dnl
 dnl  Interface plugins
 dnl
@@ -2926,7 +2950,7 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS}
     LDFLAGS="${LDFLAGS_save} ${LDFLAGS_skins2}"
     AC_CHECK_LIB(xml2,xmlTextReaderConstName,[],[
       skins2_missing_lib="yes"
-      AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version])
+      AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version; maybe you are missing libpng.])
       if test "${enable_skins2}" = "yes"; then
         AC_MSG_ERROR([libxml2 missing the xmlTextReader extension (required for skins2)])
       fi])
@@ -2955,59 +2979,59 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS}
 fi
 
 
-dnl
-dnl  Gtk+ module
-dnl
-AC_ARG_ENABLE(gtk,
-  [  --enable-gtk            Gtk+ support (default enabled)])
-if test "${enable_gtk}" != "no"
-then
-  GTK_PATH="${PATH}"
-  AC_ARG_WITH(gtk-config-path,
-    [    --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)],
-    [ if test "${with_gtk_config_path}" != "no"
-      then
-        GTK_PATH="${with_gtk_config_path}:${PATH}"
-      fi ])
-  # look for gtk-config
-  AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH})
-  GTK_CONFIG=${GTK12_CONFIG}
-  if test "${GTK_CONFIG}" = "no"
-  then
-    AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
-  fi
-  if test "${GTK_CONFIG}" != "no"
-  then
-    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
-    if test "${SYS}" != "mingw32"; then
-      AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`])
-      AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`])
-    else
-      AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`])
-      AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`])
-    fi
-    # now look for the gtk.h header
-    CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gtk}"
-    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 "${ac_cv_gtk_headers}" = "yes"
-    then
-      AX_ADD_PLUGINS([gtk])
-      if test "${SYS}" != "mingw32"; then
-        NEED_GTK_MAIN=yes
-      fi
-      ALIASES="${ALIASES} gvlc"
-    fi
-    CPPFLAGS="${CPPFLAGS_save}"
-  fi
-fi
-
+dnl dnl
+dnl dnl  Gtk+ module
+dnl dnl
+dnl AC_ARG_ENABLE(gtk,
+dnl   [  --enable-gtk            Gtk+ support (default enabled)])
+dnl if test "${enable_gtk}" != "no"
+dnl then
+dnl   GTK_PATH="${PATH}"
+dnl   AC_ARG_WITH(gtk-config-path,
+dnl     [    --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)],
+dnl     [ if test "${with_gtk_config_path}" != "no"
+dnl       then
+dnl         GTK_PATH="${with_gtk_config_path}:${PATH}"
+dnl       fi ])
+dnl   # look for gtk-config
+dnl   AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH})
+dnl   GTK_CONFIG=${GTK12_CONFIG}
+dnl   if test "${GTK_CONFIG}" = "no"
+dnl   then
+dnl     AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
+dnl   fi
+dnl   if test "${GTK_CONFIG}" != "no"
+dnl   then
+dnl     if expr 1.2.0 \> `${GTK_CONFIG} --version` >/dev/null
+dnl     then
+dnl       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.])
+dnl     fi
+dnl     if test "${SYS}" != "mingw32"; then
+dnl       AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`])
+dnl       AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`])
+dnl     else
+dnl       AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`])
+dnl       AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`])
+dnl     fi
+dnl     # now look for the gtk.h header
+dnl     CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gtk}"
+dnl     ac_cv_gtk_headers=yes
+dnl     AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [
+dnl       ac_cv_gtk_headers=no
+dnl       echo "Cannot find gtk development headers."
+dnl     ])
+dnl     if test "${ac_cv_gtk_headers}" = "yes"
+dnl     then
+dnl       AX_ADD_PLUGINS([gtk])
+dnl       if test "${SYS}" != "mingw32"; then
+dnl         NEED_GTK_MAIN=yes
+dnl       fi
+dnl       ALIASES="${ALIASES} gvlc"
+dnl     fi
+dnl     CPPFLAGS="${CPPFLAGS_save}"
+dnl   fi
+dnl fi
+dnl 
 dnl
 dnl  Gtk+2 module ! Disabled for now as it is unusable and confuses users
 dnl
@@ -3028,7 +3052,7 @@ dnl
 dnl  PDA Gtk+2 module
 dnl
 AC_ARG_ENABLE(pda,
-  [  --enable-pda          PDA interface needs Gtk2 support (default disabled)])
+  [  --enable-pda            PDA interface needs Gtk2 support (default disabled)])
 if test "x${enable_pda}" = "xyes"
 then
   PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
@@ -3042,39 +3066,39 @@ then
   fi
 fi
 
-dnl
-dnl  Gnome module
-dnl
-AC_ARG_ENABLE(gnome,
-  [  --enable-gnome          Gnome interface support (default disabled)],
-  [if test "${enable_gnome}" = "yes"; then
-    # look for gnome-config
-    AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
-    if test -x ${GNOME_CONFIG}
-    then
-       AX_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`])
-       AX_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`])
-    fi
-    # now look for the gnome.h header
-    CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gnome}"
-    AC_CHECK_HEADERS(gnome.h, [
-      AX_ADD_PLUGINS([gnome])
-      NEED_GTK_MAIN=yes
-      NEED_GNOME_MAIN=yes
-      ALIASES="${ALIASES} gnome-vlc"
-      dnl We need this because of some moronic gnomesupport.h flavours
-      AC_MSG_CHECKING(for strndup in gnome.h)
-      AC_EGREP_HEADER(strndup,gnome.h,[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(STRNDUP_IN_GNOME_H, 1,
-                  Define if <gnome.h> defines strndup.)],[
-        AC_MSG_RESULT(no)])
-     ],[
-      AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
-developement tools or remove the --enable-gnome option])
-     ])
-    CPPFLAGS="${CPPFLAGS_save}"
-  fi])
+dnl dnl
+dnl dnl  Gnome module
+dnl dnl
+dnl AC_ARG_ENABLE(gnome,
+dnl   [  --enable-gnome          Gnome interface support (default disabled)],
+dnl   [if test "${enable_gnome}" = "yes"; then
+dnl     # look for gnome-config
+dnl     AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+dnl     if test -x ${GNOME_CONFIG}
+dnl     then
+dnl        AX_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`])
+dnl        AX_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`])
+dnl     fi
+dnl     # now look for the gnome.h header
+dnl     CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gnome}"
+dnl     AC_CHECK_HEADERS(gnome.h, [
+dnl       AX_ADD_PLUGINS([gnome])
+dnl       NEED_GTK_MAIN=yes
+dnl       NEED_GNOME_MAIN=yes
+dnl       ALIASES="${ALIASES} gnome-vlc"
+dnl       dnl We need this because of some moronic gnomesupport.h flavours
+dnl       AC_MSG_CHECKING(for strndup in gnome.h)
+dnl       AC_EGREP_HEADER(strndup,gnome.h,[
+dnl         AC_MSG_RESULT(yes)
+dnl         AC_DEFINE(STRNDUP_IN_GNOME_H, 1,
+dnl                   Define if <gnome.h> defines strndup.)],[
+dnl         AC_MSG_RESULT(no)])
+dnl      ],[
+dnl       AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
+dnl developement tools or remove the --enable-gnome option])
+dnl      ])
+dnl     CPPFLAGS="${CPPFLAGS_save}"
+dnl   fi])
 
 dnl
 dnl  Gnome2 module ! Disabled for know as it is unuseable and confuses users
@@ -3134,65 +3158,65 @@ then
   fi
 fi
 
-dnl
-dnl  Qt module
-dnl
-AC_ARG_ENABLE(qt,
-  [  --enable-qt             Qt interface support (default disabled)],
-  [if test "${enable_qt}" = "yes"; then
-     AX_ADD_PLUGINS([qt])
-     ALIASES="${ALIASES} qvlc"
-     AX_ADD_LDFLAGS([qt],[-L${QTDIR}/lib])
-     LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}"
-     AC_CHECK_LIB(qt-mt,main,[
-       AX_ADD_LDFLAGS([qt],[-lqt-mt])
-     ],[
-       AC_CHECK_LIB(qt,main,[
-         AX_ADD_LDFLAGS([qt],[-lqt])
-       ])
-     ])
-     LDFLAGS="${LDFLAGS_save}"
-     AX_ADD_CXXFLAGS([qt],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include])
-     if test -x ${QTDIR}/bin/moc
-     then
-       MOC=${QTDIR}/bin/moc
-     else
-       MOC=moc
-     fi
-   fi])
-
-dnl
-dnl  KDE module
-dnl
-AC_ARG_ENABLE(kde,
-  [  --enable-kde            KDE interface support (default disabled)],
-  [if test "${enable_kde}" = "yes"; then
-     AX_ADD_PLUGINS([kde])
-     ALIASES="${ALIASES} kvlc"
-     AX_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib])
-     dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3)
-     LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
-     AC_CHECK_LIB(kfile,main,[
-       AX_ADD_LDFLAGS([kde],[-lkfile])
-     ])
-     LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
-     AC_CHECK_LIB(kdeui,main,[
-       AX_ADD_LDFLAGS([kde],[-lkdeui])
-     ])
-     LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
-     AC_CHECK_LIB(kio,main,[
-       AX_ADD_LDFLAGS([kde],[-lkio])
-     ])
-     LDFLAGS="${LDFLAGS_save}"
-     AX_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt])
-     AX_ADD_CXXFLAGS([kde],[-I${KDEDIR}/include -I${QTDIR}/include])
-     if test -x ${QTDIR}/bin/moc
-     then
-       MOC=${QTDIR}/bin/moc
-     else
-       MOC=moc
-     fi
-   fi])
+dnl dnl
+dnl dnl  Qt module
+dnl dnl
+dnl AC_ARG_ENABLE(qt,
+dnl   [  --enable-qt             Qt interface support (default disabled)],
+dnl   [if test "${enable_qt}" = "yes"; then
+dnl      AX_ADD_PLUGINS([qt])
+dnl      ALIASES="${ALIASES} qvlc"
+dnl      AX_ADD_LDFLAGS([qt],[-L${QTDIR}/lib])
+dnl      LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}"
+dnl      AC_CHECK_LIB(qt-mt,main,[
+dnl        AX_ADD_LDFLAGS([qt],[-lqt-mt])
+dnl      ],[
+dnl        AC_CHECK_LIB(qt,main,[
+dnl          AX_ADD_LDFLAGS([qt],[-lqt])
+dnl        ])
+dnl      ])
+dnl      LDFLAGS="${LDFLAGS_save}"
+dnl      AX_ADD_CXXFLAGS([qt],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include])
+dnl      if test -x ${QTDIR}/bin/moc
+dnl      then
+dnl        MOC=${QTDIR}/bin/moc
+dnl      else
+dnl        MOC=moc
+dnl      fi
+dnl    fi])
+dnl 
+dnl dnl
+dnl dnl  KDE module
+dnl dnl
+dnl AC_ARG_ENABLE(kde,
+dnl   [  --enable-kde            KDE interface support (default disabled)],
+dnl   [if test "${enable_kde}" = "yes"; then
+dnl      AX_ADD_PLUGINS([kde])
+dnl      ALIASES="${ALIASES} kvlc"
+dnl      AX_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib])
+dnl      dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3)
+dnl      LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
+dnl      AC_CHECK_LIB(kfile,main,[
+dnl        AX_ADD_LDFLAGS([kde],[-lkfile])
+dnl      ])
+dnl      LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
+dnl      AC_CHECK_LIB(kdeui,main,[
+dnl        AX_ADD_LDFLAGS([kde],[-lkdeui])
+dnl      ])
+dnl      LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
+dnl      AC_CHECK_LIB(kio,main,[
+dnl        AX_ADD_LDFLAGS([kde],[-lkio])
+dnl      ])
+dnl      LDFLAGS="${LDFLAGS_save}"
+dnl      AX_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt])
+dnl      AX_ADD_CXXFLAGS([kde],[-I${KDEDIR}/include -I${QTDIR}/include])
+dnl      if test -x ${QTDIR}/bin/moc
+dnl      then
+dnl        MOC=${QTDIR}/bin/moc
+dnl      else
+dnl        MOC=moc
+dnl      fi
+dnl    fi])
 
 dnl
 dnl  Opie QT embedded module
@@ -3312,27 +3336,42 @@ then
   dnl test for --with-goom-tree
   dnl
   if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}"; then
-    AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
+    AC_MSG_CHECKING(for libgoom2.a in ${with_goom_tree})
     real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`"
     if test -z "${real_goom_tree}"; then
       dnl  The given directory can't be found
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([cannot cd to ${with_goom_tree}])
     fi
-    if test -f "${real_goom_tree}/libgoom.a"; then
-      AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
+    if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
+      AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
       AX_ADD_BUILTINS([goom])
-      AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
-      AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}])
+      AX_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
+      AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
     else
-      dnl  The given libgoom wasn't built
+      dnl  The given libgoom2 wasn't built, try to look for the old goom
       AC_MSG_RESULT(no)
-      AC_MSG_ERROR([cannot find ${real_goom_tree}/libgoom.a, make sure you compiled goom in ${with_goom_tree}])
+      AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
+      if test -f "${real_goom_tree}/libgoom.a"; then
+        AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
+        AX_ADD_BUILTINS([goom])
+        AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
+        AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
+      else
+        dnl  The given libgoom wasn't built
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}])
+      fi
     fi
   else
-    dnl  The --with-goom-tree isn't specified wasn't built
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([You have to specify a tree with --with-goom-tree])
+    AC_CHECK_HEADERS(goom/goom.h, [
+      AC_CHECK_LIB(goom2, goom_init, [
+        AX_ADD_PLUGINS([goom])
+        AX_ADD_LDFLAGS([goom],[-lgoom2])
+      ],[
+        AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.])
+      ])
+    ])
   fi
 fi
 
@@ -3340,8 +3379,8 @@ dnl
 dnl  SLP access plugin
 dnl
 AC_ARG_ENABLE(slp,
-  [  --enable-slp            SLP service discovery support (default enabled)])
-if test "${enable_slp}" != "no"
+  [  --enable-slp            SLP service discovery support (default disabled)])
+if test "${enable_slp}" = "yes"
 then
   AC_ARG_WITH(slp,
   [    --with-slp=PATH       libslp headers and libraries])
@@ -3400,37 +3439,29 @@ then
                )
 fi
 
-
 dnl
 dnl corba (ORBit) plugin
 dnl
+dnl Default: do not enable corba
+enablecorba=false
 AC_ARG_ENABLE(corba,
   [  --enable-corba          corba interface support (default disabled)])
 if test "${enable_corba}" = "yes"; then
-  ORBIT_PATH="${PATH}"
-  AC_ARG_WITH(orbit-config-path,
-  [    --with-orbit-config-path=PATH orbit-config path (default search in \$PATH)])
-  if test "${with_orbit_config_path}" != "no"; then
-    ORBIT_PATH="${with_orbit_config_path}:${PATH}"
-  fi
-  # look for orbit2-config
-  AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no, ${ORBIT_PATH})
-  if test "${ORBIT_CONFIG}" != "no"; then
-    AX_ADD_CFLAGS(corba,[`${ORBIT_CONFIG} --cflags server`])
-    AX_ADD_LDFLAGS(corba,[`${ORBIT_CONFIG} --libs server | sed 's,-rdynamic,,'`])
-    # now look for the orbit.h header
-    CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_corba}"
-    ac_cv_corba_headers=yes
-    AC_CHECK_HEADERS(orbit/orbit.h, , [
-      ac_cv_corba_headers=no
-      AC_MSG_ERROR([Could not find corba development headers])
-    ])
-    if test "${ac_cv_corba_headers}" = "yes"; then
-      AX_ADD_PLUGINS(corba)
-    fi
-    CPPFLAGS="${CPPFLAGS_save}"
-  fi
-fi
+      GLIB_VERSION=2.3.2
+      PKG_CHECK_MODULES(CORBA, 
+       ORBit-2.0 >= 2.8.0 \
+       glib-2.0 >= $GLIB_VERSION \
+       gobject-2.0 >= $GLIB_VERSION \
+       gthread-2.0 >= $GLIB_VERSION,
+       [
+         enablecorba=true
+         AX_ADD_LDFLAGS([corba],[$CORBA_LIBS])
+         AX_ADD_CFLAGS([corba],[$CORBA_CFLAGS])
+          AX_ADD_PLUGINS([corba snapshot]) ],
+        [ enablecorba=false
+         AC_MSG_WARN(corba library not found) ])
+fi
+AM_CONDITIONAL(ENABLE_CORBA, test x$enablecorba = xtrue)
 
 AC_ARG_WITH(,[Misc options:])
 
@@ -3525,6 +3556,7 @@ then
 dnl special case for mingw32
 elif test "${enable_mozilla}" = "yes"
 then
+  AC_CHECK_TOOL(CYGPATH, cygpath, "")
   AC_ARG_WITH(mozilla-sdk-path,
     [    --with-mozilla-sdk-path=PATH path to win32 mozilla sdk], [
     real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
@@ -3533,7 +3565,12 @@ then
       mozilla=:
       AX_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk} -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
       AX_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -lnspr4 -lplds4 -lplc4 -lembedstring -lxpcomglue -Wl,--kill-at])
-      XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl" ])
+      XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl"
+      if test -n "${CYGPATH}"; then
+        XPIDL="${real_mozilla_sdk}/xpcom/bin/xpidl"
+        real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`"
+        XPIDL_INCL="${XPIDL_INCL} -I\"${real_mozilla_sdk}/xpcom/idl\""
+      fi ])
     CPPFLAGS="${CPPFLAGS_save}"
   ])
 fi
@@ -3602,9 +3639,9 @@ dnl
 if test "${NEED_QTE_MAIN}" != "no"
 then
     AX_ADD_PLUGINS([qte_main])
-    AX_ADD_CPPFLAGS([qte opie vout_sdl],[-DNEED_QTE_MAIN])
-    AX_ADD_CXXFLAGS([qte_main],[${CPPFLAGS_qte} ${CXXFLAGS_qte}])
-    AX_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte}])
+    AX_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN])
+    AX_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}])
+    AX_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}])
 fi
 
 
@@ -3662,7 +3699,7 @@ dnl
 dnl  Stuff used by the program
 dnl
 AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2004 VideoLAN", [Copyright string])
 AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
 
 VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
@@ -3734,8 +3771,6 @@ AC_CONFIG_FILES([
   modules/access/Makefile
   modules/access/dshow/Makefile
   modules/access/dvb/Makefile
-  modules/access/dvd/Makefile
-  modules/access/dvdplay/Makefile
   modules/access/dvdread/Makefile
   modules/access/mms/Makefile
   modules/access/pvr/Makefile
@@ -3752,14 +3787,13 @@ AC_CONFIG_FILES([
   modules/audio_mixer/Makefile
   modules/audio_output/Makefile
   modules/codec/Makefile
+  modules/codec/cmml/Makefile
   modules/codec/ffmpeg/Makefile
   modules/codec/ffmpeg/postprocessing/Makefile
   modules/codec/ogt/Makefile
   modules/codec/spudec/Makefile
   modules/control/Makefile
   modules/control/corba/Makefile
-  modules/control/lirc/Makefile
-  modules/control/rc/Makefile
   modules/demux/Makefile
   modules/demux/asf/Makefile
   modules/demux/avi/Makefile
@@ -3774,7 +3808,6 @@ AC_CONFIG_FILES([
   modules/gui/gtk2/Makefile
   modules/gui/kde/Makefile
   modules/gui/macosx/Makefile
-  modules/gui/ncurses/Makefile
   modules/gui/qnx/Makefile
   modules/gui/qt/Makefile
   modules/gui/skins/Makefile
@@ -3782,7 +3815,6 @@ AC_CONFIG_FILES([
   modules/gui/wxwindows/Makefile
   modules/misc/Makefile
   modules/misc/dummy/Makefile
-  modules/misc/logger/Makefile
   modules/misc/memcpy/Makefile
   modules/misc/network/Makefile
   modules/misc/testsuite/Makefile
@@ -3794,15 +3826,11 @@ AC_CONFIG_FILES([
   modules/stream_out/transrate/Makefile
   modules/video_chroma/Makefile
   modules/video_filter/Makefile
-  modules/video_filter/deinterlace/Makefile
   modules/video_output/Makefile
   modules/video_output/directx/Makefile
-  modules/video_output/mga/Makefile
   modules/video_output/qte/Makefile
   modules/video_output/x11/Makefile
   modules/visualization/Makefile
-  modules/visualization/scope/Makefile
-  modules/visualization/xosd/Makefile
   modules/visualization/visual/Makefile
 ])