* ./plugins/network/ipv4.c: fixed ipv4.so compilation under QNX.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index ff7baf4279375d792aae0cfc2b0df26fc829f802..d13e827a3af933917d3e49ab99ce6234f6edbf95 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,28 +1,15 @@
-dnl Autoconf settings for vlc and libdvdcss
+dnl Autoconf settings for vlc

 AC_INIT(include/main.h)
 AC_CONFIG_HEADER(include/defs.h)
 AC_INIT(include/main.h)
 AC_CONFIG_HEADER(include/defs.h)

-

 AC_CANONICAL_SYSTEM
 
 AC_CANONICAL_SYSTEM
 

-HAVE_VLC=0
-if test -r src/interface/main.c; then
-  HAVE_VLC=1
-  VLC_VERSION="0.2.92-dev"
-  VLC_CODENAME=Ourumov
-fi
-
-HAVE_LIBDVDCSS=0
-if test -r extras/libdvdcss/libdvdcss.c; then
-  HAVE_LIBDVDCSS=1
-  LIBDVDCSS_VERSION="1.0.1-dev"
-  AC_SUBST(LIBDVDCSS_VERSION)
-  if test -r extras/libdvdcss/csskeys.h; then
-    AC_DEFINE(HAVE_CSSKEYS,1,css decryption with player keys)
-  fi
-fi
+PACKAGE="vlc"
+VERSION="0.3.1"
+CODENAME=Ourumov

 
 dnl Save CFLAGS and LDFLAGS
 save_CFLAGS="${CFLAGS}"
 
 dnl Save CFLAGS and LDFLAGS
 save_CFLAGS="${CFLAGS}"

+save_CPPFLAGS="${CPPFLAGS}"

 save_LDFLAGS="${LDFLAGS}"
 
 dnl Check for tools
 save_LDFLAGS="${LDFLAGS}"
 
 dnl Check for tools


@@ -32,12 +19,30 @@ AC_PROG_CPP
 
 dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)

+AC_CHECK_TOOL(STRIP, strip, :)
+
+dnl Check for GNU make
+AC_PATH_PROG(GMAKE, gmake, no)
+if test "x$GMAKE" = "xno"; then
+  AC_CACHE_CHECK([whether GNU make is installed],
+      [ac_cv_gmake],
+      [if make --version | grep -q -i gnu; then
+         ac_cv_gmake="yes"
+       else
+         echo "This software needs you to install GNU make to compile properly."
+         echo "You can get it from http://www.gnu.org/."
+         exit
+       fi])
+  VLC_MAKE="make"
+else
+  VLC_MAKE="gmake"
+fi

 
 dnl Gettext stuff
 
 dnl Gettext stuff

-ALL_LINGUAS="de fr no ru"
+ALL_LINGUAS="de en_GB fr ja no ru nl"

 
 

-AC_DEFINE_UNQUOTED(PACKAGE, "vlc")
-AC_DEFINE_UNQUOTED(VERSION, "$VLC_VERSION")
+AC_DEFINE_UNQUOTED(VLC_PACKAGE, "$PACKAGE", [Package name])
+AC_DEFINE_UNQUOTED(VLC_VERSION, "$VERSION", [Package version])

 AM_GNU_GETTEXT
 
 dnl AM_PROG_LIBTOOL
 AM_GNU_GETTEXT
 
 dnl AM_PROG_LIBTOOL


@@ -55,73 +60,100 @@ case x"${target_os}" in
     ;;
   xbsdi*)
     SYS=bsdi
     ;;
   xbsdi*)
     SYS=bsdi

+    save_CFLAGS="${save_CFLAGS} -pthread"
+    dvd_LDFLAGS="${dvd_LDFLAGS} -ldvd"
+    vcd_LDFLAGS="${vcd_LDFLAGS} -ldvd"
+    ;;
+  x*bsd*)
+    SYS="${target_os}"
+    save_CFLAGS="${save_CFLAGS} -pthread"

     ;;
   xdarwin*)
     SYS=darwin
     ;;
   xdarwin*)
     SYS=darwin

+    save_CFLAGS="${save_CFLAGS} -no-cpp-precomp"

     ;;
   x*mingw32*)
     SYS=mingw32
     AC_CHECK_TOOL(WINDRES, windres, :)
     ;;
   x*mingw32*)
     SYS=mingw32
     AC_CHECK_TOOL(WINDRES, windres, :)

-    LIB_IPV4="${LIB_IPV4} -lws2_32"
-    LIB_RC="${LIB_RC} -lws2_32"
+    save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long"
+    vlc_LDFLAGS="${vlc_LDFLAGS} -mwindows -Xlinker --force-exe-suffix"
+    vlc_LDFLAGS="${vlc_LDFLAGS} -lws2_32 -lnetapi32"
+    ipv4_LDFLAGS="${ipv4_LDFLAGS} -lws2_32"
+    rc_LDFLAGS="${rc_LDFLAGS} -lws2_32"

     ;;
   x*nto*)
     SYS=nto
     ;;
   x*nto*)
     SYS=nto

-    LIB_X11="${LIB_X11} -lsocket"
-    LIB_XVIDEO="${LIB_XVIDEO} -lsocket"
+    x11_LDFLAGS="${x11_LDFLAGS} -lsocket"
+    xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket"

     ;;
   xbeos)
     SYS=beos
     ;;
   xbeos)
     SYS=beos

-    LIB="${LIB} -lbe -lbind"
-    LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
-    PLDFLAGS="${PLDFLAGS} -nostart"
+    save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"
+    vlc_LDFLAGS="${vlc_LDFLAGS} -lbe"
+    plugins_LDFLAGS="${plugins_LDFLAGS} -nostart"
+    beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker"
+    ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind"

     ;;
   x*)
     ;;
   x*)

-    SYS=${target_os}
+    SYS="${target_os}"

     ;;
 esac
 
     ;;
 esac
 

+dnl Flags for plugin compilation
+if test x"${SYS}" = xmingw32
+then
+  plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct"
+else
+  plugins_CFLAGS="${plugins_CFLAGS} -fPIC"
+fi
+
+dnl The -DSYS_FOO flag
+save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"
+

 dnl Check for system libs needed
 dnl Check for system libs needed

-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty usleep vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2)
+

 AC_CHECK_FUNC(connect,,[
 AC_CHECK_FUNC(connect,,[

-  AC_CHECK_LIB(socket,connect,LIB="${LIB} -lsocket")
+  AC_CHECK_LIB(socket,connect,
+    ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket"
+    vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket"
+)])
+AC_CHECK_FUNC(gethostbyname,,[
+  AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl")

 ])
 AC_CHECK_FUNC(gethostbyname,,[
 ])
 AC_CHECK_FUNC(gethostbyname,,[

-  AC_CHECK_LIB(nsl,gethostbyname,LIB="${LIB} -lnsl")
+  AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind")

 ])
 AC_CHECK_FUNC(nanosleep,,[
 ])
 AC_CHECK_FUNC(nanosleep,,[

-  AC_CHECK_LIB(rt,nanosleep,LIB="${LIB} -lrt",[
-    AC_CHECK_LIB(posix4,nanosleep,LIB="${LIB} -lposix4")
+  AC_CHECK_LIB(rt,nanosleep,vlc_LDFLAGS="${vlc_LDFLAGS} -lrt",[
+    AC_CHECK_LIB(posix4,nanosleep,vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4")

   ])
 ])
   ])
 ])

-AC_CHECK_FUNCS(usleep)

 AC_CHECK_FUNC(inet_aton,,[
 AC_CHECK_FUNC(inet_aton,,[

-  AC_CHECK_LIB(resolv,inet_aton,LIB="${LIB} -lresolv")
+  AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv")
+])
+AC_CHECK_FUNC(textdomain,,[
+  AC_CHECK_LIB(intl,textdomain,save_LDFLAGS="${save_LDFLAGS} -lintl")

 ])
 ])

-AC_CHECK_FUNCS(vasprintf)
-AC_CHECK_FUNCS(swab)
-AC_CHECK_FUNCS([memalign valloc])
-
-AC_CHECK_FUNCS(sigrelse)
-AC_CHECK_FUNCS(getpwuid_r getpwuid)

 
 dnl Check for getopt
 NEED_GETOPT=0
 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
 [ # FreeBSD has a gnugetopt library for this:
   AC_CHECK_LIB([gnugetopt],[getopt_long],
 
 dnl Check for getopt
 NEED_GETOPT=0
 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
 [ # FreeBSD has a gnugetopt library for this:
   AC_CHECK_LIB([gnugetopt],[getopt_long],

-    [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB="${LIB} -lgnugetopt"],
+    [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) vlc_LDFLAGS="${vlc_LDFLAGS} -lgnugetopt"],

     [NEED_GETOPT=1])])
 
 AC_TYPE_SIGNAL
     [NEED_GETOPT=1])])
 
 AC_TYPE_SIGNAL

-AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
+AC_CHECK_LIB(dl,dlopen,vlc_LDFLAGS="${vlc_LDFLAGS} -ldl")

 AC_CHECK_LIB(m,cos,
 AC_CHECK_LIB(m,cos,

-  LIB_IMDCT="${LIB_IMDCT} -lm"
-  LIB_FILTER_DISTORT="${LIB_FILTER_DISTORT} -lm")
+  imdct_LDFLAGS="${imdct_LDFLAGS} -lm"
+  filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm")

 AC_CHECK_LIB(m,pow,
 AC_CHECK_LIB(m,pow,

-  LIB_IMDCT="${LIB_IMDCT} -lm"
-  LIB_IMDCT3DN="${LIB_IMDCT3DN} -lm"
-  LIB_IMDCTSSE="${LIB_IMDCTSSE} -lm"
+  imdct_LDFLAGS="${imdct_LDFLAGS} -lm"
+  imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm"
+  imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm"
+  chroma_i420_rgb_LDFLAGS="${chroma_i420_rgb_LDFLAGS} -lm"

 )
 
 dnl Check for pthreads - borrowed from XMMS
 )
 
 dnl Check for pthreads - borrowed from XMMS


@@ -153,10 +185,11 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 
 dnl Check for headers
 AC_CHECK_HEADERS(getopt.h strings.h)
 
 dnl Check for headers
 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/sockio.h fcntl.h sys/types.h sys/time.h sys/times.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 sys/shm.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 sys/shm.h)

+AC_CHECK_HEADERS(linux/version.h)

 
 AC_HEADER_TIME
 
 
 AC_HEADER_TIME
 


@@ -172,15 +205,14 @@ then
   if test x$x_libraries = xNONE; then
     x_libraries=/usr/X11R6/lib
   fi
   if test x$x_libraries = xNONE; then
     x_libraries=/usr/X11R6/lib
   fi

-  saved_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS -I$x_includes"
+  CPPFLAGS="$save_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.)
     ])
   ])
   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
+  CPPFLAGS="$save_CPPFLAGS"

 fi
 
 dnl Check for ntohl, etc.
 fi
 
 dnl Check for ntohl, etc.


@@ -287,7 +319,7 @@ AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic],
     [CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic"
      AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)])
 if test x"$ac_cv_ld_darwin" != x"no"; then
     [CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic"
      AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)])
 if test x"$ac_cv_ld_darwin" != x"no"; then

-    PLDFLAGS="${PLDFLAGS} -bundle -undefined error -lcc_dynamic"
+    plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic"

 fi
 
 dnl Check for standard plugin linking flags
 fi
 
 dnl Check for standard plugin linking flags


@@ -296,34 +328,21 @@ 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
     [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

-    PLDFLAGS="${PLDFLAGS} -shared"
+    plugins_LDFLAGS="${plugins_LDFLAGS} -shared"

 fi
         
 fi
         

-dnl Check for soname setting
-if test x"${SOFLAGS}" = x; then
-    AC_CACHE_CHECK([for soname setting],
-        [ac_cv_ld_soname],
-        [
-        # Standard
-        try_SOFLAGS="-Wl,-soname -Wl,"
-        LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
-        AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}", [
-            # SunOS
-            try_SOFLAGS="-Wl,-h -Wl,"
-            LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
-            AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}",
-                ac_cv_ld_soname=none)
-        ])])
-    if test x"$ac_cv_ld_soname" != x"none"; then
-        SOFLAGS=$ac_cv_ld_soname
-    else
-        echo "
-------------
-Your system doesn't seem to have support for dynamic linking. You may
-have problems using libdvdcss.
-------------
-"
-    fi
+dnl Check for variadic macros
+AC_CACHE_CHECK([for variadic cpp macros],
+    [ac_cv_cpp_variadic_macros],
+    [CFLAGS="${save_CFLAGS}"
+     AC_TRY_COMPILE(
+         [#include <stdio.h>
+          #define a(b,c...) printf(b,##c)],
+         [a("foo");a("%s","bar");a("%s%s","baz","quux");],
+         ac_cv_cpp_variadic_macros=yes,
+         ac_cv_cpp_variadic_macros=no)])
+if test x"$ac_cv_cpp_variadic_macros" != x"no"; then
+    AC_DEFINE(HAVE_VARIADIC_MACROS, 1, Support for variadic macros)

 fi
 
 dnl Checks for __attribute__(aligned()) directive
 fi
 
 dnl Checks for __attribute__(aligned()) directive


@@ -343,6 +362,7 @@ fi
 
 dnl End of the bizarre compilation tests
 CFLAGS="${save_CFLAGS}"
 
 dnl End of the bizarre compilation tests
 CFLAGS="${save_CFLAGS}"

+CPPFLAGS="${save_CPPFLAGS}"

 LDFLAGS="${save_LDFLAGS}"
 
 dnl Check for boolean_t
 LDFLAGS="${save_LDFLAGS}"
 
 dnl Check for boolean_t


@@ -378,7 +398,7 @@ case x"${target_cpu}" in
     ARCH=unknown
     ;;
   *)
     ARCH=unknown
     ;;
   *)

-    ARCH=${target_cpu}
+    ARCH="${target_cpu}"

     ;;
 esac
 
     ;;
 esac
 


@@ -395,7 +415,7 @@ MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mm
 MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
 THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
 SSE_MODULES="imdctsse downmixsse"
 MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
 THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
 SSE_MODULES="imdctsse downmixsse"

-ALTIVEC_MODULES="idctaltivec motionaltivec"
+ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"

 
 AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
     [ac_cv_mmx_inline],
 
 AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
     [ac_cv_mmx_inline],


@@ -426,7 +446,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
     [ac_cv_sse_inline],
     [AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
                     ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
     [ac_cv_sse_inline],
     [AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
                     ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])

-if test x"$ac_cv_sse_inline" != x"no"; then
+if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then

   AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
   ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
 fi
   AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
   ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
 fi


@@ -448,9 +468,10 @@ 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
 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_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_altivec_inline"
-    CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_altivec_inline"
-    CFLAGS_VLC="$CFLAGS_VLC $ac_cv_altivec_inline"
+    idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline"
+    motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_altivec_inline"
+    memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_altivec_inline"
+    vlc_CFLAGS="$vlc_CFLAGS $ac_cv_altivec_inline"

   fi
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
   fi
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi


@@ -463,7 +484,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
      AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
         ac_cv_c_altivec=-faltivec, [
         # Linux/PPC test

-        CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec"
+        CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -fvec"

         AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
             [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
         ])
         AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
             [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
         ])


@@ -471,9 +492,10 @@ 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.)
     ])
 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_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_c_altivec"
-  CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_c_altivec"
-  CFLAGS_VLC="$CFLAGS_VLC $ac_cv_c_altivec"
+  idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec"
+  motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec"
+  memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_c_altivec"
+  vlc_CFLAGS="$vlc_CFLAGS $ac_cv_c_altivec"

   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
 
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
 


@@ -485,129 +507,13 @@ AC_CACHE_CHECK([if linker needs -framework vecLib],
      LDFLAGS=$save_LDFLAGS
     ])
 if test x"$ac_cv_ld_altivec" != x"no"; then
      LDFLAGS=$save_LDFLAGS
     ])
 if test x"$ac_cv_ld_altivec" != x"no"; then

-  LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib"
-  LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib"
-  LIB="${LIB} -framework vecLib"
+  idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib"
+  motionaltivec_LDFLAGS="${motionaltivec_LDFLAGS} -framework vecLib"
+  memcpyaltivec_LDFLAGS="${memcpyaltivec_LDFLAGS} -framework vecLib"
+  vlc_LDFLAGS="${vlc_LDFLAGS} -framework vecLib"

 fi
 fi # end if mingw32
 
 fi
 fi # end if mingw32
 

-dnl
-dnl  DVD and VCD devices
-dnl
-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
-dnl
-
-dnl  default is no
-CAN_BUILD_LIBDVDCSS=0
-
-dnl  for windoze
-AC_CHECK_HEADERS(winioctl.h,[
-  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
-])
-
-dnl  for Un*x and BeOS
-AC_CHECK_HEADERS(sys/ioctl.h,[
-  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
-  AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h)
-  BSD_DVD_STRUCT=0
-  LINUX_DVD_STRUCT=0
-  OPENBSD_DVD_STRUCT=0
-  dnl
-  dnl Old FreeBSD: sys/cdio.h
-  dnl
-  AC_EGREP_HEADER(dvd_struct,sys/cdio.h,[
-    AC_DEFINE(DVD_STRUCT_IN_SYS_CDIO_H, 1,
-              Define if <sys/cdio.h> defines dvd_struct.)
-    AC_EGREP_HEADER(struct dvd_struct,sys/cdio.h,[
-                    BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1; OPENBSD_DVD_STRUCT=1])
-  ])
-  dnl
-  dnl Newer FreeBSD: sys/dvdio.h
-  dnl
-  AC_EGREP_HEADER(dvd_struct,sys/dvdio.h,[
-    AC_DEFINE(DVD_STRUCT_IN_SYS_DVDIO_H, 1,
-              Define if <sys/dvdio.h> defines dvd_struct.)
-    AC_EGREP_HEADER(struct dvd_struct,sys/dvdio.h,[
-                    BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1])
-  ])
-  dnl
-  dnl Linux: linux/cdrom.h
-  dnl
-  AC_EGREP_HEADER(dvd_struct,linux/cdrom.h,[
-    AC_DEFINE(DVD_STRUCT_IN_LINUX_CDROM_H, 1,
-              Define if <linux/cdrom.h> defines DVD_STRUCT.)
-    LINUX_DVD_STRUCT=1
-  ])
-  dnl
-  dnl BSDI: dvd.h
-  dnl
-  NEED_BSDI_LIBDVD=0
-  AC_EGREP_HEADER(dvd_struct,dvd.h,[
-    AC_DEFINE(DVD_STRUCT_IN_DVD_H, 1,
-              Define if <dvd.h> defines DVD_STRUCT.)
-    LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd"
-    LINUX_DVD_STRUCT=1
-  ],[
-    dnl
-    dnl BSDI: /sys/dev/scsi/scsi_ioctl.h, using our own libdvd
-    dnl
-    AC_CHECK_HEADERS(/sys/dev/scsi/scsi_ioctl.h,[
-      NEED_BSDI_LIBDVD=1
-      AC_DEFINE(DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H, 1,
-                Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT.)
-      SRC_DVDCSS_EXTRA="${SRC_DVDCSS_EXTRA} bsdi_dvdioctl.c"
-      LINUX_DVD_STRUCT=1
-    ])
-  ])
-  dnl
-  dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h
-  dnl
-  AC_CHECK_HEADER(sys/scsi/scsi_types.h,[
-    AC_CHECK_HEADER(sys/scsi/impl/uscsi.h,[
-      AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
-    ])
-  ])
-  dnl
-  dnl HP-UX: sys/scsi.h
-  dnl
-  AC_CHECK_HEADER(sys/scsi.h,[
-    AC_EGREP_HEADER(sctl_io,sys/scsi.h,[
-      AC_DEFINE(HPUX_SCTL_IO, 1, Define if <sys/scsi.h> defines sctl_io.)
-    ])
-  ])
-  dnl
-  dnl Final tests to check what was detected
-  dnl
-  if test x$LINUX_DVD_STRUCT = x1; then
-    AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
-              Define if Linux-like dvd_struct is defined.)
-    if test x$OPENBSD_DVD_STRUCT = x1; then
-      AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1,
-                Define if OpenBSD-like dvd_struct is defined.)
-    fi
-  else
-    if test x$BSD_DVD_STRUCT = x1; then
-      AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
-                Define if FreeBSD-like dvd_struct is defined.)
-    fi
-  fi
-])

 
 AC_ARG_WITH(,[])
 AC_ARG_WITH(,[Optimization options:])
 
 AC_ARG_WITH(,[])
 AC_ARG_WITH(,[Optimization options:])


@@ -618,8 +524,8 @@ dnl
 AC_ARG_WITH(tuning,
 [  --with-tuning=ARCH      enable special tuning for an architecture
                           (default i686 on IA-32 and 750 on PPC)])
 AC_ARG_WITH(tuning,
 [  --with-tuning=ARCH      enable special tuning for an architecture
                           (default i686 on IA-32 and 750 on PPC)])

-if test "x$withval" != "x"; then
-    TUNING=$withval
+if test "x$with_tuning" != "x"; then
+    TUNING="$with_tuning"

 else
     if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xi486 -o x${target_cpu} = xi386; then TUNING="pentiumpro"
     else
 else
     if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xi486 -o x${target_cpu} = xi386; then TUNING="pentiumpro"
     else


@@ -641,7 +547,7 @@ dnl  Enable/disable optimizations
 dnl
 AC_ARG_ENABLE(optimizations,
 [  --disable-optimizations disable compiler optimizations (default enabled)],
 dnl
 AC_ARG_ENABLE(optimizations,
 [  --disable-optimizations disable compiler optimizations (default enabled)],

-[ if test x$enableval = xno; then OPTIMS=0; fi ],
+[ if test x$enable_optimizations = xno; then OPTIMS=0; fi ],

 [ OPTIMS=1 ])
 
 dnl
 [ OPTIMS=1 ])
 
 dnl


@@ -649,7 +555,7 @@ dnl  AltiVec acceleration
 dnl
 AC_ARG_ENABLE(altivec,
 [  --disable-altivec       disable altivec optimizations (default enabled on PPC)],
 dnl
 AC_ARG_ENABLE(altivec,
 [  --disable-altivec       disable altivec optimizations (default enabled on PPC)],

-[ if test x$enableval = xyes; then ARCH="${ARCH} altivec";
+[ if test x$enable_altivec = xyes; then ARCH="${ARCH} altivec";

     BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
 [ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec";
     BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])
     BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
 [ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec";
     BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])


@@ -660,16 +566,16 @@ dnl
 DEBUG=0
 AC_ARG_ENABLE(debug,
 [  --enable-debug          debug mode (default disabled)],
 DEBUG=0
 AC_ARG_ENABLE(debug,
 [  --enable-debug          debug mode (default disabled)],

-[ if test x$enableval = xyes; then DEBUG=1; fi ])
+[ if test x$enable_debug = xyes; then DEBUG=1; fi ])

 
 dnl
 dnl  Enable release-specific flags
 dnl
 
 dnl
 dnl  Enable release-specific flags
 dnl

+RELEASE=0

 AC_ARG_ENABLE(release,
 [  --enable-release        activate extra optimizations (default disabled)],
 AC_ARG_ENABLE(release,
 [  --enable-release        activate extra optimizations (default disabled)],

-[ if test x$enableval = xyes; then RELEASE=1; fi ],
-[ VLC_VERSION="${VLC_VERSION}_`date +%Y-%m-%d`";
-  LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ])
+[ if test x$enable_release = xyes; then RELEASE=1; fi ],
+[ VERSION="${VERSION}_`date +%Y-%m-%d`" ])

 
 dnl
 dnl  Input plugins
 
 dnl
 dnl  Input plugins


@@ -678,143 +584,164 @@ dnl
 AC_ARG_WITH(,[Input plugins:])
 
 dnl
 AC_ARG_WITH(,[Input plugins:])
 
 dnl

-dnl  DVD module: check for installed libdvdcss or local libdvdcss
-dnl
-NEED_LIBDVDCSS=0
-STATIC_LIBDVDCSS=0
-DUMMY_LIBDVDCSS=0
-AC_ARG_WITH(dvdcss,
-  [  --with-dvdcss[=name]    use libdvdcss, either 'yes', 'no', 'local-static',
-                          'local-shared', or a path to another libdvdcss such
-                          as '/usr/local' (default 'local-static')],
-  [ case "x${withval}" in
-    xlocal-static|xyes)
-      # local libdvdcss, statically linked
-      BUILTINS="${BUILTINS} dvd"
-      if test x${CAN_BUILD_LIBDVDCSS} = x1
-      then
-        NEED_LIBDVDCSS=1
-        STATIC_LIBDVDCSS=1
-        CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
-        LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
-      fi
-    ;;
-    xlocal-shared)
-      # local libdvdcss, dynamically linked
-      PLUGINS="${PLUGINS} dvd"
-      if test x${CAN_BUILD_LIBDVDCSS} = x1
+dnl  DVD module: optionally check for installed libdvdcss
+dnl
+AC_ARG_ENABLE(dvd,
+[  --enable-dvd            DVD input module (default enabled)])
+if test "x$enable_dvd" != "xno"
+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 "x$with_dvdcss" in
+  x|xyes)
+    if test "x$with_dvdcss_tree" = x
+    then
+      AC_CHECK_HEADERS(dvdcss/dvdcss.h,
+        [ PLUGINS="${PLUGINS} dvd"
+          dvd_LDFLAGS="${dvd_LDFLAGS} -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 "x$real_dvdcss_tree" = x

       then
       then

-        NEED_LIBDVDCSS=1
-        CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
-        LIB_DVD="${LIB_DVD} -L../../lib -ldvdcss"
+        dnl  The given directory can't be found
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR([cannot cd to ${with_dvdcss_tree}])

       fi
       fi

-    ;;
-    xno)
-      # don't use libdvdcss at all, build a DVD module that can dlopen() it
-      PLUGINS="${PLUGINS} dvd"
-      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"
-    ;;
-    *)
-      # existing libdvdcss
-      PLUGINS="${PLUGINS} dvd"
-      if test "x$withval" != "xyes"
+      if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a"

       then
       then

-        LIB_DVD="${LIB_DVD} -L"$withval"/lib"
-        CFLAGS_DVD="${CFLAGS_DVD} -I"$withval"/include"
+        dnl  Use a custom libdvdcss
+        AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a)
+        BUILTINS="${BUILTINS} dvd"
+        dvd_LDFLAGS="${dvd_LDFLAGS} ${real_dvdcss_tree}/src/.libs/libdvdcss.a"
+        dvd_CFLAGS="${dvd_CFLAGS} -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

-      LIB_DVD="${LIB_DVD} -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
+    fi
+  ;;
+  xno)
+    dnl  Compile without dvdcss (dlopen version, works only under Linux)
+    PLUGINS="${PLUGINS} dvd"
+    dvd_CFLAGS="${dvd_CFLAGS} -DGOD_DAMN_DMCA"
+    dvd_LDFLAGS="${dvd_LDFLAGS} -ldl"
+  ;;
+  *)
+    AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss})
+    if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h

     then
     then

-      BUILTINS="${BUILTINS} dvd"
-      NEED_LIBDVDCSS=1
-      STATIC_LIBDVDCSS=1
-      CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
-      LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
-    else
-      # XXX: no check for libdl is done, don't try this at home !
+      dnl  Use ${with_dvdcss}/include/dvdcss/dvdcss.h
+      AC_MSG_RESULT(yes)

       PLUGINS="${PLUGINS} dvd"
       PLUGINS="${PLUGINS} dvd"

-      DUMMY_LIBDVDCSS=1
-      SRC_DVD_EXTRA="${SRC_DVD_EXTRA} dummy_dvdcss.c"
-      CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
-      LIB_DVD="${LIB_DVD} -ldl"
-    fi ])
+      dvd_LDFLAGS="${dvd_LDFLAGS} -L${with_dvdcss}/lib -ldvdcss"
+      dvd_CFLAGS="${dvd_CFLAGS} -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

-dnl DVDREAD module: check for libdvdread plugin
+dnl dvdread module: check for libdvdread plugin

 dnl
 dnl

-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]   use libdvdread, same options as 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
+AC_ARG_ENABLE(dvdread,
+[  --enable-dvdread        dvdread input module (default disabled)])
+if test "x$enable_dvdread" != "xno"
+then
+  AC_ARG_WITH(dvdread, 
+  [    --with-dvdread=PATH   libdvdread headers and libraries])
+  if test "x$with_dvdread" = x
+  then
+    test_LDFLAGS=""
+    test_CFLAGS=""
+  else
+    test_LDFLAGS="-L${with_dvdread}/lib"
+    test_CFLAGS="-I${with_dvdread}/include"
+  fi
+  CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
+  AC_CHECK_HEADERS(dvdread/dvd_reader.h, [
+     AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>],
+        [void foo() { int i=DVD_VIDEO_LB_LEN; }],[
+          PLUGINS="${PLUGINS} dvdread"
+          dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread"
+          dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}"
+        ],[
+          if test "x$enable_dvdread" != x
+          then
+            AC_MSG_ERROR([Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later])
+          fi
+        ])
+  ],[
+    if test "x$enable_dvdread" != x
+    then
+      if test "x$with_dvdread" != x

       then
       then

-        AC_MSG_ERROR([Can't link shared dvdread with static dvdcss])
+        AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h in ${with_dvdread}/include])

       else
       else

-        #PLUGINS="${PLUGINS} dvdread"
-        CFLAGS_DVDREAD="${CFLAGS_DVDREAD} ${CFLAGS_DVD}"
-        LIB_DVDREAD="${LIB_DVDREAD} -ldvdread ${LIB_DVD}"
+        AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h])

       fi
       fi

-    esac
-    if test x${DUMMY_LIBDVDCSS} = x1
-    then
-      LIB_LIBDVDREAD="${LIB_LIBDVDREAD} -ldl"
-    else
-      LIB_LIBDVDREAD="${LIB_LIBDVDREAD} -L../../lib -ldvdcss"
-    fi ])
+    fi
+  ])
+  CPPFLAGS="$save_CPPFLAGS"
+fi

 
 

+dnl
+dnl  libdvbpsi ts demux
+dnl
+AC_ARG_ENABLE(dvbpsi,
+[  --enable-dvbpsi        dvbpsi ts demux module (default disabled)])
+if test "x$enable_dvbpsi" != "xno"
+then
+  AC_ARG_WITH(dvbpsi, 
+  [    --with-dvbpsi=PATH    libdvbpsi headers and libraries])
+  if test "x$with_dvbpsi" = x
+  then
+    test_LDFLAGS=""
+    test_CFLAGS=""
+  else
+    test_LDFLAGS="-L${with_dvbpsi}/lib"
+    test_CFLAGS="-I${with_dvbpsi}/include"
+  fi
+  CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
+  AC_CHECK_HEADER([dvbpsi/dvbpsi.h],[
+    PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
+    mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi"
+    mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}"
+    ],[
+    if test "x$enable_dvbpsi" != x
+    then
+      AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org])
+    fi
+  ])
+  CPPFLAGS="$save_CPPFLAGS"
+fi
+ 

 dnl
 dnl  VCD module
 dnl
 AC_ARG_ENABLE(vcd,
 dnl
 dnl  VCD module
 dnl
 AC_ARG_ENABLE(vcd,

-  [  --enable-vcd            VCD support for Linux (default enabled)])
+  [  --enable-vcd            VCD support for Linux, FreeBSD and MacOS X (default enabled)])

 
 if test x$enable_vcd != xno
 then
   AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
     PLUGINS="${PLUGINS} vcd"
   ])
 
 if test x$enable_vcd != xno
 then
   AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
     PLUGINS="${PLUGINS} vcd"
   ])

-
+  
+  AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[
+    PLUGINS="${PLUGINS} vcd"
+    AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
+  ])
+  

   if test "x${SYS}" = "xbsdi"
   then
     PLUGINS="${PLUGINS} vcd"
   if test "x${SYS}" = "xbsdi"
   then
     PLUGINS="${PLUGINS} vcd"


@@ -822,16 +749,38 @@ then
 
   if test "x${SYS}" = "xdarwin"
   then
 
   if test "x${SYS}" = "xdarwin"
   then

-    PLUGINS="${PLUGINS} vcd"
-    LIB_VCD="${LIB_VCD} -framework IOKit -framework CoreFoundation" 
+    # No need to add vcd to PLUGINS, Darwin is already based on FreeBSD
+    vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" 

   fi
 fi
 
 dnl
   fi
 fi
 
 dnl

-dnl  ipv6 plugin
+dnl  Satellite input module

 dnl
 dnl

-AC_EGREP_HEADER(in6_addr,netinet/in.h,[
-  PLUGINS="${PLUGINS} ipv6"])
+AC_ARG_ENABLE(satellite,
+  [  --enable-satellite      satellite card support (default disabled)],
+  [ if test x$enable_satellite = xyes
+    then
+      PLUGINS="${PLUGINS} satellite"
+    fi])
+
+dnl
+dnl  ipv6 plugin - not for QNX yet
+dnl
+if test x$SYS != xnto
+then
+  AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"])
+fi
+
+dnl
+dnl  AVI demux plugin
+dnl
+AC_ARG_ENABLE(avi,
+  [  --enable-avi            AVI demux module (default enabled)])
+if test x$enable_avi != xno
+then
+  PLUGINS="${PLUGINS} avi"
+fi

 
 dnl
 dnl  Codec plugins
 
 dnl
 dnl  Codec plugins


@@ -844,21 +793,21 @@ dnl  mad plugin
 dnl
 AC_ARG_ENABLE(mad,
   [  --enable-mad            libmad module (default disabled)])
 dnl
 AC_ARG_ENABLE(mad,
   [  --enable-mad            libmad module (default disabled)])

-if test x$enable_mad == xyes
+if test x$enable_mad = xyes

 then
   PLUGINS="${PLUGINS} mad"
 then
   PLUGINS="${PLUGINS} mad"

-  LIB_MAD="${LIB_MAD} -lmad"
+  mad_LDFLAGS="${mad_LDFLAGS} -lmad"

   AC_ARG_WITH(mad,
     [    --with-mad=PATH       path to libmad],
   AC_ARG_WITH(mad,
     [    --with-mad=PATH       path to libmad],

-    [ if test "x$with_val" != "xno" -a "x$with_val" != "x"
+    [ if test "x$with_mad" != "xno" -a "x$with_mad" != "x"

       then
       then

-        CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include"
-        LIB_MAD="${LIB_MAD} -L$with_val/lib"
+        mad_CFLAGS="${mad_CFLAGS} -I$with_mad/include"
+        mad_LDFLAGS="${mad_LDFLAGS} -L$with_mad/lib"

       fi ])
   save_CFLAGS=$CFLAGS
   save_LDFLAGS=$LDFLAGS
       fi ])
   save_CFLAGS=$CFLAGS
   save_LDFLAGS=$LDFLAGS

-  CFLAGS="$CFLAGS $CFLAGS_MAD"
-  LDFLAGS="$LDFLAGS $LIB_MAD"
+  CFLAGS="$CFLAGS $mad_CFLAGS"
+  LDFLAGS="$LDFLAGS $mad_LDFLAGS"

   AC_CHECK_HEADERS(mad.h, ,
   [ echo "Cannot find development headers for libmad..."
     exit 1
   AC_CHECK_HEADERS(mad.h, ,
   [ echo "Cannot find development headers for libmad..."
     exit 1


@@ -871,25 +820,116 @@ then
   LDFLAGS=$save_LDFLAGS
 fi
 
   LDFLAGS=$save_LDFLAGS
 fi
 

+dnl
+dnl  ffmpeg decoder plugin
+dnl
+AC_ARG_ENABLE(ffmpeg,
+[  --enable-ffmpeg         ffmpeg codec (default disabled)])
+if test "x$enable_ffmpeg" = "xyes"
+then
+  AC_ARG_WITH(ffmpeg-tree, 
+  [    --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
+  if test "x$with_ffmpeg_tree" = x
+  then
+    AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
+  else
+    AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree})
+    real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
+    if test "x$real_ffmpeg_tree" = x
+    then
+      dnl  The given directory can't be found
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}])
+    fi
+    if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"
+    then
+      dnl  Use a custom libffmpeg
+      AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
+      BUILTINS="${BUILTINS} ffmpeg"
+      ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a"
+      ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec"
+    else
+      dnl  The given libavcodec wasn't built
+      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
+  fi
+fi
+
+

 dnl special case for BeOS
 if test x$SYS = xbeos
 then
     PLUGINS="${PLUGINS} beos"
 dnl special case for BeOS
 if test x$SYS = xbeos
 then
     PLUGINS="${PLUGINS} beos"

-
-dnl default case
-else
+fi

 
 dnl
 dnl  a52 AC3 decoder plugin
 dnl
 AC_ARG_ENABLE(a52,
 
 dnl
 dnl  a52 AC3 decoder plugin
 dnl
 AC_ARG_ENABLE(a52,

-  [  --disable-a52           AC3 support with liba52 (default enabled)])
-if test "x$enableval" != "xno" -a x$SYS != xmingw32
+  [  --enable-a52            AC3 support with liba52 (default enabled)])
+if test "x$enable_a52" != "xno"
+then
+  AC_ARG_WITH(a52-tree,
+    [    --with-a52-tree=PATH  a52dec tree for static linking ],[],[])
+  if test "x$with_a52_tree" != "xno" -a "x$with_a52_tree" != "x"

   then
   then

+    real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`"
+    if test "x$real_a52_tree" = x
+    then
+      dnl  The given directory can't be found
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([${with_a52_tree} directory doesn't exist])
+    fi
+    dnl  Use a custom a52dec
+    AC_MSG_CHECKING(for a52.h in ${real_a52_tree}/include)
+    if test -f ${real_a52_tree}/include/a52.h
+    then
+      AC_MSG_RESULT(yes)
+      a52_CFLAGS="${a52_CFLAGS} -I${real_a52_tree}"
+      a52_LDFLAGS="${a52_LDFLAGS} -L${real_a52_tree}/liba52/.libs"
+      save_LDFLAGS=$LDFLAGS
+      LDFLAGS="$a52_LDFLAGS $LDFLAGS"
+      AC_CHECK_LIB(a52, a52_free, [
+        BUILTINS="${BUILTINS} a52"
+        a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm"
+        a52_CFLAGS="${a52_CFLAGS} -DUSE_A52DEC_TREE"
+        ],[
+        if test -f ${real_a52_tree}/liba52/.libs/liba52.a
+        then
+          AC_MSG_ERROR([make sure you have at least a52dec-0.7.3])
+        else
+          AC_MSG_ERROR([the specified tree hasn't been compiled])
+        fi
+      ],[-lm])
+      LDFLAGS=$save_LDFLAGS
+    else
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([the specified tree doesn't have a52.h])
+    fi
+  else dnl  no with args

     AC_CHECK_HEADERS(a52dec/a52.h, [
     AC_CHECK_HEADERS(a52dec/a52.h, [

-      BUILTINS="${BUILTINS} a52"
-      LIB_A52="${LIB_A52} -la52"
-     ],[])
+      AC_CHECK_LIB(a52, a52_free, [
+        BUILTINS="${BUILTINS} a52"
+        a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm"
+        a52_CFLAGS="${a52_CFLAGS}"
+      ],[],[-lm])
+    ])
+  fi
+fi
+
+dnl
+dnl  ogg vorbis plugin
+dnl
+AC_ARG_ENABLE(vorbis,
+  [  --enable-vorbis         Ogg/Vorbis decoder support (default enabled)])
+if test "x$enable_vorbis" != "xno"
+then
+  AC_CHECK_HEADERS(ogg/ogg.h, [
+    dnl disabled for the moment
+    #PLUGINS="${PLUGINS} vorbis"
+    vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis"
+   ],[])

 fi
 
 dnl
 fi
 
 dnl


@@ -903,7 +943,7 @@ dnl  X11 module
 dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(x11,
 dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(x11,

-  [  --disable-x11           X11 support (default enabled)])
+  [  --enable-x11            X11 support (default enabled)])

 if test x$enable_x11 != xno &&
   (test x$SYS != xmingw32 || test x$enable_x11 = xyes); then
   if test x$x_includes = xNONE; then
 if test x$enable_x11 != xno &&
   (test x$SYS != xmingw32 || test x$enable_x11 = xyes); then
   if test x$x_includes = xNONE; then


@@ -912,14 +952,13 @@ if test x$enable_x11 != xno &&
   if test x$x_libraries = xNONE; then
     x_libraries=/usr/X11R6/lib
   fi
   if test x$x_libraries = xNONE; then
     x_libraries=/usr/X11R6/lib
   fi

-  saved_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS -I$x_includes"
+  CPPFLAGS="$save_CPPFLAGS -I$x_includes"

   AC_CHECK_HEADERS(X11/Xlib.h, [
     PLUGINS="${PLUGINS} x11"
   AC_CHECK_HEADERS(X11/Xlib.h, [
     PLUGINS="${PLUGINS} x11"

-    LIB_X11="${LIB_X11} -L$x_libraries -lX11 -lXext"
-    CFLAGS_X11="${CFLAGS_X11} -I$x_includes"
+    x11_LDFLAGS="${x11_LDFLAGS} -L$x_libraries -lX11 -lXext"
+    x11_CFLAGS="${x11_CFLAGS} -I$x_includes"

   ])
   ])

-  CPPFLAGS=$saved_CPPFLAGS
+  CPPFLAGS="$save_CPPFLAGS"

 fi
 
 dnl
 fi
 
 dnl


@@ -927,7 +966,7 @@ dnl  XVideo module
 dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(xvideo,
 dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(xvideo,

-  [  --disable-xvideo        XVideo support (default enabled)])
+  [  --enable-xvideo         XVideo support (default enabled)])

 if test x$enable_xvideo != xno &&
   (test x$SYS != xmingw32 || test x$enable_xvideo = xyes); then
   if test x$x_includes = xNONE; then
 if test x$enable_xvideo != xno &&
   (test x$SYS != xmingw32 || test x$enable_xvideo = xyes); then
   if test x$x_includes = xNONE; then


@@ -936,38 +975,38 @@ if test x$enable_xvideo != xno &&
   if test x$x_libraries = xNONE; then
     x_libraries=/usr/X11R6/lib
   fi
   if test x$x_libraries = xNONE; then
     x_libraries=/usr/X11R6/lib
   fi

-  saved_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS -I$x_includes"
+  save_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$save_CPPFLAGS -I$x_includes"

   AC_CHECK_HEADERS(X11/extensions/Xv.h, [
   AC_CHECK_HEADERS(X11/extensions/Xv.h, [

-    saved_CFLAGS=$CFLAGS
+    save_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"
     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",
+      xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv_pic"
+      xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes",

       # We don't have Xv_pic, let's make xvideo.a as builtin
       BUILTINS="${BUILTINS} xvideo"
       # 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
+      xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv"
+      xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes")
+    CFLAGS="$save_CFLAGS"

   ]
   ]

-  CPPFLAGS=$saved_CPPFLAGS)
+  CPPFLAGS="$save_CPPFLAGS")

 fi
 
 dnl
 dnl  SDL module
 dnl
 AC_ARG_ENABLE(sdl,
 fi
 
 dnl
 dnl  SDL module
 dnl
 AC_ARG_ENABLE(sdl,

-  [  --disable-sdl           SDL support (default enabled)])
+  [  --enable-sdl            SDL support (default enabled)])

 if test "x$enable_sdl" != "xno"
 then
   SDL_PATH=$PATH
   AC_ARG_WITH(sdl-config-path,
     [    --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
 if test "x$enable_sdl" != "xno"
 then
   SDL_PATH=$PATH
   AC_ARG_WITH(sdl-config-path,
     [    --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],

-    [ if test "x$withval" != "xno"
+    [ if test "x$with_sdl_config_path" != "xno"

       then
       then

-        SDL_PATH=$withval:$PATH
+        SDL_PATH="$with_sdl_config_path:$PATH"

       fi ])
   AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, $SDL_PATH)
   SDL_CONFIG=${SDL12_CONFIG}
       fi ])
   AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, $SDL_PATH)
   SDL_CONFIG=${SDL12_CONFIG}


@@ -986,17 +1025,16 @@ then
   if test x${SDL_CONFIG} != xno
   then
     PLUGINS="${PLUGINS} sdl"
   if test x${SDL_CONFIG} != xno
   then
     PLUGINS="${PLUGINS} sdl"

-    CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`"
-    LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
-    save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $CFLAGS_SDL"
+    sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`"
+    sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
+    CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS"

     AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
       <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),
       [ AC_MSG_ERROR([The development package for SDL is not installed. 
 Please install it and try again. Alternatively you can also configure with 
 --disable-sdl.])
       ])
     AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
       <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),
       [ AC_MSG_ERROR([The development package for SDL is not installed. 
 Please install it and try again. Alternatively you can also configure with 
 --disable-sdl.])
       ])

-    CPPFLAGS=$save_CPPFLAGS
+    CPPFLAGS="$save_CPPFLAGS"

     if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
     then
       AC_MSG_ERROR([The development package for SDL is not installed.
     if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
     then
       AC_MSG_ERROR([The development package for SDL is not installed.


@@ -1016,7 +1054,7 @@ dnl  Windows DirectX module
 dnl
 AC_ARG_ENABLE(directx,
   [  --enable-directx        Win32 DirectX support (default enabled on Win32)])
 dnl
 AC_ARG_ENABLE(directx,
   [  --enable-directx        Win32 DirectX support (default enabled on Win32)])

-if test "x$enableval" != "xno"
+if test "x$enable_directx" != "xno"

 then
   if test x$SYS = xmingw32
   then
 then
   if test x$SYS = xmingw32
   then


@@ -1026,18 +1064,18 @@ then
     then
       AC_CHECK_HEADERS(ddraw.h,
       [ PLUGINS="${PLUGINS} directx"
     then
       AC_CHECK_HEADERS(ddraw.h,
       [ PLUGINS="${PLUGINS} directx"

-        LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ])
+        directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" ])

     else
     else

-      AC_MSG_CHECKING(for directX headers in ${withval})
-      if test -f ${withval}/ddraw.h
+      AC_MSG_CHECKING(for directX headers in ${with_directx})
+      if test -f ${with_directx}/ddraw.h

       then
         PLUGINS="${PLUGINS} directx"
       then
         PLUGINS="${PLUGINS} directx"

-        LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32"
-        INCLUDE="${INCLUDE} -I${withval}"
+        directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32"
+        directx_CFLAGS="${directx_CFLAGS} -I${with_directx}"

         AC_MSG_RESULT(yes)
       else
         AC_MSG_RESULT(no)
         AC_MSG_RESULT(yes)
       else
         AC_MSG_RESULT(no)

-        AC_MSG_ERROR([Cannot find ${withval}/ddraw.h!])
+        AC_MSG_ERROR([Cannot find ${with_directx}/ddraw.h!])

       fi
     fi
   fi
       fi
     fi
   fi


@@ -1070,16 +1108,16 @@ dnl  GGI module
 dnl
 AC_ARG_ENABLE(ggi,
   [  --enable-ggi            GGI support (default disabled)])
 dnl
 AC_ARG_ENABLE(ggi,
   [  --enable-ggi            GGI support (default disabled)])

-if test x$enable_ggi == xyes
+if test x$enable_ggi = xyes

 then
   PLUGINS="${PLUGINS} ggi"
 then
   PLUGINS="${PLUGINS} ggi"

-  LIB_GGI="${LIB_GGI} -lggi"
+  ggi_LDFLAGS="${ggi_LDFLAGS} -lggi"

   AC_ARG_WITH(ggi,
     [    --with-ggi=PATH       path to libggi],
   AC_ARG_WITH(ggi,
     [    --with-ggi=PATH       path to libggi],

-    [ if test "x$with_val" != "xno" -a "x$with_val" != "x"
+    [ if test "x$with_ggi" != "xno" -a "x$with_ggi" != "x"

       then
       then

-        CFLAGS_GGI="${CFLAGS_GGI} -I$with_val/include"
-        LIB_GGI="${LIB_GGI} -L$with_val/lib"
+        CFLAGS_GGI="${CFLAGS_GGI} -I$with_ggi/include"
+        ggi_LDFLAGS="${ggi_LDFLAGS} -L$with_ggi/lib"

       fi ])
 fi
 
       fi ])
 fi
 


@@ -1088,20 +1126,35 @@ dnl  Glide module
 dnl
 AC_ARG_ENABLE(glide,
   [  --enable-glide          Glide (3dfx) support (default disabled)])
 dnl
 AC_ARG_ENABLE(glide,
   [  --enable-glide          Glide (3dfx) support (default disabled)])

-if test x$enable_glide == xyes
+if test x$enable_glide = xyes

 then
   PLUGINS="${PLUGINS} glide"
 then
   PLUGINS="${PLUGINS} glide"

-  LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm"
-  CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide"
+  glide_LDFLAGS="${glide_LDFLAGS} -lglide2x -lm"
+  glide_CFLAGS="${glide_CFLAGS} -I/usr/include/glide"

   AC_ARG_WITH(glide,
     [    --with-glide=PATH     path to libglide],
   AC_ARG_WITH(glide,
     [    --with-glide=PATH     path to libglide],

-    [ if test "x$with_val" != "xno" -a "x$with_val" != "x"
+    [ if test "x$with_glide" != "xno" -a "x$with_glide" != "x"

       then
       then

-        CFLAGS_GLIDE="${CFLAGS_GLIDE} -I$with_val/include"
-        LIB_GLIDE="${LIB_GLIDE} -L$with_val/lib"
+        glide_CFLAGS="${glide_CFLAGS} -I$with_glide/include"
+        glide_LDFLAGS="${glide_LDFLAGS} -L$with_glide/lib"

       fi ])
 fi
 
       fi ])
 fi
 

+dnl
+dnl  AA plugin
+dnl
+AC_ARG_ENABLE(aa,
+  [  --enable-aa             aalib output (default disabled)])
+if test x$enable_aa = xyes
+then
+  AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false")
+  if test x$have_aa = xtrue
+  then
+    PLUGINS="${PLUGINS} aa"
+    aa_LDFLAGS="${aa_LDFLAGS} -laa"
+  fi
+fi
+

 dnl
 dnl  Audio plugins
 dnl
 dnl
 dnl  Audio plugins
 dnl


@@ -1119,7 +1172,7 @@ if test x$enable_dsp != xno &&
 then
   AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
     PLUGINS="${PLUGINS} dsp"
 then
   AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
     PLUGINS="${PLUGINS} dsp"

-    AC_CHECK_LIB(ossaudio,main,LIB_DSP="${LIB_DSP} -lossaudio")
+    AC_CHECK_LIB(ossaudio,main,dsp_LDFLAGS="${dsp_LDFLAGS} -lossaudio")

   ])
 fi
 
   ])
 fi
 


@@ -1134,8 +1187,8 @@ AC_ARG_ENABLE(esd,
      if test x${ESD_CONFIG} != xno
      then
        PLUGINS="${PLUGINS} esd"
      if test x${ESD_CONFIG} != xno
      then
        PLUGINS="${PLUGINS} esd"

-       CFLAGS_ESD="${CFLAGS_ESD} `${ESD_CONFIG} --cflags`"
-       LIB_ESD="${LIB_ESD} `${ESD_CONFIG} --libs`"
+       esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`"
+       esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`"

      fi
    fi])
 
      fi
    fi])
 


@@ -1150,8 +1203,8 @@ AC_ARG_ENABLE(arts,
      if test x${ARTS_CONFIG} != xno
      then
        PLUGINS="${PLUGINS} arts"
      if test x${ARTS_CONFIG} != xno
      then
        PLUGINS="${PLUGINS} arts"

-       CFLAGS_ARTS="${CFLAGS_ARTS} `${ARTS_CONFIG} --cflags`"
-       LIB_ARTS="${LIB_ARTS} `${ARTS_CONFIG} --libs `"
+       arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`"
+       arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `"

      fi
    fi])
 
      fi
    fi])
 


@@ -1166,7 +1219,7 @@ AC_ARG_ENABLE(alsa,
      if test x$have_alsa = xtrue
      then
        PLUGINS="${PLUGINS} alsa"
      if test x$have_alsa = xtrue
      then
        PLUGINS="${PLUGINS} alsa"

-       LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl"
+       alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl"

      fi
    fi])
 
      fi
    fi])
 


@@ -1175,10 +1228,10 @@ dnl  win32 waveOut plugin
 dnl
 AC_ARG_ENABLE(waveout,
   [  --enable-waveout        Win32 waveOut module (default enabled on Win32)])
 dnl
 AC_ARG_ENABLE(waveout,
   [  --enable-waveout        Win32 waveOut module (default enabled on Win32)])

-if test "x$enableval" != "xno" -a x$SYS = xmingw32
+if test "x$enable_waveout" != "xno" -a x$SYS = xmingw32

   then
     PLUGINS="${PLUGINS} waveout"
   then
     PLUGINS="${PLUGINS} waveout"

-    LIB_WAVEOUT="-lwinmm"
+    waveout_LDFLAGS="-lwinmm"

 fi
 
 dnl
 fi
 
 dnl


@@ -1191,15 +1244,15 @@ dnl
 dnl  Gtk+ module
 dnl
 AC_ARG_ENABLE(gtk,
 dnl  Gtk+ module
 dnl
 AC_ARG_ENABLE(gtk,

-  [  --disable-gtk           Gtk+ support (default enabled)])
+  [  --enable-gtk            Gtk+ support (default enabled)])

 if test x$enable_gtk != xno
 then
   GTK_PATH=$PATH
   AC_ARG_WITH(gtk-config-path,
     [    --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)],
 if test x$enable_gtk != xno
 then
   GTK_PATH=$PATH
   AC_ARG_WITH(gtk-config-path,
     [    --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)],

-    [ if test "x$withval" != "xno"
+    [ if test "x$with_gtk_config_path" != "xno"

       then
       then

-        GTK_PATH=$withval:$PATH
+        GTK_PATH="$with_gtk_config_path:$PATH"

       fi ])
   # look for gtk-config
   AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, $GTK_PATH)
       fi ])
   # look for gtk-config
   AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, $GTK_PATH)


@@ -1214,11 +1267,10 @@ then
     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
     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,,'`"
+    gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`"
+    gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"

     # now look for the gtk.h header
     # now look for the gtk.h header

-    saved_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
+    CPPFLAGS="$save_CPPFLAGS $gtk_CFLAGS"

     ac_cv_gtk_headers=yes
     AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [
       ac_cv_gtk_headers=no
     ac_cv_gtk_headers=yes
     AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [
       ac_cv_gtk_headers=no


@@ -1229,7 +1281,7 @@ then
       PLUGINS="${PLUGINS} gtk"
       ALIASES="${ALIASES} gvlc"
     fi
       PLUGINS="${PLUGINS} gtk"
       ALIASES="${ALIASES} gvlc"
     fi

-    CPPFLAGS=$saved_CPPFLAGS
+    CPPFLAGS="$save_CPPFLAGS"

   fi
 fi
 
   fi
 fi
 


@@ -1243,21 +1295,19 @@ AC_ARG_ENABLE(gnome,
     AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
     if test -x ${GNOME_CONFIG}
     then
     AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
     if test -x ${GNOME_CONFIG}
     then

-       CFLAGS_GNOME="${CFLAGS_GNOME} `${GNOME_CONFIG} --cflags gtk gnomeui`"
-       LIB_GNOME="${LIB_GNOME} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"
+       gnome_CFLAGS="${gnome_CFLAGS} `${GNOME_CONFIG} --cflags gtk gnomeui`"
+       gnome_LDFLAGS="${gnome_LDFLAGS} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"

     fi
     # now look for the gnome.h header
     fi
     # now look for the gnome.h header

-    saved_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $CFLAGS_GNOME"
+    CPPFLAGS="$save_CPPFLAGS $gnome_CFLAGS"

     AC_CHECK_HEADERS(gnome.h, [
       PLUGINS="${PLUGINS} gnome"
       ALIASES="${ALIASES} gnome-vlc"
      ],[
       AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
     AC_CHECK_HEADERS(gnome.h, [
       PLUGINS="${PLUGINS} gnome"
       ALIASES="${ALIASES} gnome-vlc"
      ],[
       AC_MSG_ERROR([Can't find gnome headers. Please install the gnome

-developement librairie or remove the --enable-gnome option])
+developement tools or remove the --enable-gnome option])

      ])
      ])

-  
-    CPPFLAGS=$saved_CPPFLAGS
+    CPPFLAGS="$save_CPPFLAGS"

   fi])
 
 dnl
   fi])
 
 dnl


@@ -1268,8 +1318,8 @@ AC_ARG_ENABLE(qt,
   [if test x$enable_qt = xyes; then
      PLUGINS="${PLUGINS} qt"
      ALIASES="${ALIASES} qvlc"
   [if test x$enable_qt = xyes; then
      PLUGINS="${PLUGINS} qt"
      ALIASES="${ALIASES} qvlc"

-     LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib"
-     CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include"
+     qt_LDFLAGS="${qt_LDFLAGS} -lqt -L${QTDIR}/lib"
+     qt_CFLAGS="${qt_CFLAGS} -I/usr/include/qt -I${QTDIR}/include"

      if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc
      if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc


@@ -1286,9 +1336,9 @@ AC_ARG_ENABLE(kde,
   [if test x$enable_kde = xyes; then
      PLUGINS="${PLUGINS} kde"
      ALIASES="${ALIASES} kvlc"
   [if test x$enable_kde = xyes; then
      PLUGINS="${PLUGINS} kde"
      ALIASES="${ALIASES} kvlc"

-     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"
+     kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib -lkfile"
+     kde_CFLAGS="${kde_CFLAGS} -I/usr/include/kde -I/usr/include/qt"
+     kde_CFLAGS="${kde_CFLAGS} -I${KDEDIR}/include -I${QTDIR}/include"

      if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc
      if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc


@@ -1305,15 +1355,15 @@ AC_ARG_ENABLE(macosx,
   [if test x$enable_macosx = xyes
    then
      BUILTINS="${BUILTINS} macosx"
   [if test x$enable_macosx = xyes
    then
      BUILTINS="${BUILTINS} macosx"

-     LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
-     CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
-     LIB="${LIB} -ObjC"
+     macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc"
+     macosx_CFLAGS="${macosx_CFLAGS} -ObjC"
+     LDFLAGS="${LDFLAGS} -ObjC"

    fi],
   [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
      BUILTINS="${BUILTINS} macosx"
    fi],
   [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
      BUILTINS="${BUILTINS} macosx"

-     LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
-     CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
-     LIB="${LIB} -ObjC"
+     macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc"
+     macosx_CFLAGS="${macosx_CFLAGS} -ObjC"
+     LDFLAGS="${LDFLAGS} -ObjC"

    )])
 
 dnl
    )])
 
 dnl


@@ -1325,19 +1375,25 @@ AC_ARG_ENABLE(qnx,
     then
       AC_CHECK_HEADERS(Ph.h, [
         PLUGINS="${PLUGINS} qnx"
     then
       AC_CHECK_HEADERS(Ph.h, [
         PLUGINS="${PLUGINS} qnx"

-        LIB_QNX="${LIB_QNX} -lasound -lph"
+        qnx_LDFLAGS="${qnx_LDFLAGS} -lasound -lph"

       ])
     fi
 
 dnl
       ])
     fi
 
 dnl

-dnl  Windows MFC interface module
+dnl  Windows native interface module, built with Borland C++ Builder

 dnl
 dnl

-AC_ARG_ENABLE(win32,
-  [  --enable-win32          Win32 interface support (default disabled)],
-  [ if test "x$enableval" != "xno"
+AC_ARG_ENABLE(intfwin,
+[  --enable-intfwin        Win32 interface support (default disabled)],
+[ if test "x$enable_intfwin" != "xno"
+  then
+    AC_ARG_WITH(bcbuilder, 
+    [    --with-bcbuilder=PATH Borland C++ Builder installation path])
+    if test "x$with_bcbuilder" != "x"

     then
     then

-      PLUGINS="${PLUGINS} win32"
-    fi ])
+      BCBUILDER="$with_bcbuilder"
+    fi
+    PLUGINS="${PLUGINS} intfwin"
+  fi ])

 
 dnl
 dnl  ncurses module
 
 dnl
 dnl  ncurses module


@@ -1346,7 +1402,7 @@ AC_ARG_ENABLE(ncurses,
   [  --enable-ncurses        ncurses interface support (default disabled)],
   [if test x$enable_ncurses = xyes; then
      PLUGINS="${PLUGINS} ncurses"
   [  --enable-ncurses        ncurses interface support (default disabled)],
   [if test x$enable_ncurses = xyes; then
      PLUGINS="${PLUGINS} ncurses"

-     LIB_NCURSES="${LIB_NCURSES} -lncurses"
+     ncurses_LDFLAGS="${ncurses_LDFLAGS} -lncurses"

    fi])
 
 dnl
    fi])
 
 dnl


@@ -1360,13 +1416,10 @@ then
   if test x$have_lirc = xtrue
   then
     PLUGINS="${PLUGINS} lirc"
   if test x$have_lirc = xtrue
   then
     PLUGINS="${PLUGINS} lirc"

-    LIB_LIRC="${LIB_LIRC} -llirc_client"
+    lirc_LDFLAGS="${lirc_LDFLAGS} -llirc_client"

   fi
 fi
 
   fi
 fi
 

-dnl  end of non-BeOS stuff
-fi
-

 AC_ARG_WITH(,[Misc options:])
 
 dnl
 AC_ARG_WITH(,[Misc options:])
 
 dnl


@@ -1377,7 +1430,7 @@ 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)])
 dnl
 AC_ARG_WITH(words,
   [  --with-words=endianness set endianness (big or little)])

-  case "x$withval" in
+  case "x$with_words" in

     xbig)
       ac_cv_c_bigendian=yes
       ;;
     xbig)
       ac_cv_c_bigendian=yes
       ;;


@@ -1402,7 +1455,7 @@ EOF
         ]
         if test -f conftest.c
         then 
         ]
         if test -f conftest.c
         then 

-          if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
+          if ${CC-cc} -c conftest.c -o conftest.o >config.log 2>&1 \

               && test -f conftest.o
           then
             if test "`strings conftest.o | grep BIGenDianSyS`"
               && test -f conftest.o
           then
             if test "`strings conftest.o | grep BIGenDianSyS`"


@@ -1428,31 +1481,20 @@ then
   AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system)
 fi
 
   AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system)
 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  Profiling
 dnl
 GPROF=0
 AC_ARG_ENABLE(gprof,
 [  --enable-gprof          gprof profiling (default disabled)],
 dnl
 dnl  Profiling
 dnl
 GPROF=0
 AC_ARG_ENABLE(gprof,
 [  --enable-gprof          gprof profiling (default disabled)],

-[ if test x$enableval = xyes; then GPROF=1; fi ])
+[ if test "x$enable_gprof" = "xyes"; then GPROF=1; fi ])

 
 CPROF=0
 AC_ARG_ENABLE(cprof,
 [  --enable-cprof          cprof profiling (default disabled)],
 
 CPROF=0
 AC_ARG_ENABLE(cprof,
 [  --enable-cprof          cprof profiling (default disabled)],

-[ if test x$enableval = xyes;
+[ if test "x$enable_cprof" = "xyes";

   then
   then

-    LIB="${LIB} -lcprof"
+    LDFLAGS="${LDFLAGS} -lcprof"

     CPROF=1
   fi
 ])
     CPROF=1
   fi
 ])


@@ -1462,7 +1504,7 @@ dnl  GNU portable threads
 dnl
 AC_ARG_ENABLE(pth,
   [  --enable-pth            GNU Pth support (default disabled)],
 dnl
 AC_ARG_ENABLE(pth,
   [  --enable-pth            GNU Pth support (default disabled)],

-  [ if test x$enableval = xyes; then
+  [ if test "x$enable_pth" = "xyes"; then

     AC_CHECK_LIB(pth,pth_init)
     AC_EGREP_HEADER(pth_init,pth.h,[
       AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
     AC_CHECK_LIB(pth,pth_init)
     AC_EGREP_HEADER(pth_init,pth.h,[
       AC_DEFINE(PTH_INIT_IN_PTH_H, 1,


@@ -1476,7 +1518,7 @@ dnl  State Threads
 dnl
 AC_ARG_ENABLE(st,
   [  --enable-st             State Threads (default disabled)],
 dnl
 AC_ARG_ENABLE(st,
   [  --enable-st             State Threads (default disabled)],

-  [ if test x$enableval = xyes; then
+  [ if test "x$enable_st" = "xyes"; then

     AC_CHECK_LIB(st,st_init)
     AC_EGREP_HEADER(st_init,st.h,[
       AC_DEFINE(ST_INIT_IN_ST_H, 1,
     AC_CHECK_LIB(st,st_init)
     AC_EGREP_HEADER(st_init,st.h,[
       AC_DEFINE(ST_INIT_IN_ST_H, 1,


@@ -1485,7 +1527,7 @@ AC_ARG_ENABLE(st,
     fi])
 ])
 
     fi])
 ])
 

-LIB="${LIB} ${THREAD_LIB}"
+LDFLAGS="${LDFLAGS} ${THREAD_LIB}"

 
 dnl
 dnl  Plug-ins - this must be AT THE END
 
 dnl
 dnl  Plug-ins - this must be AT THE END


@@ -1498,15 +1540,25 @@ AC_ARG_ENABLE(plugins,
      PLUGINS=
    fi])
 
      PLUGINS=
    fi])
 

+dnl Automagically disable plug-ins if there is no system support for .so files
+dnl don't forget vlc-win32 still can load .so as plugins
+if test x$ac_cv_header_dlfcn_h = xno -a x$ac_cv_header_image_h = xno -a x$SYS != xmingw32
+then
+  echo "*** Your system doesn't have plug-in support. All plug-ins will be compiled"
+  echo "as built-in"
+  BUILTINS="${BUILTINS} ${PLUGINS}"
+  PLUGINS=
+fi
+

 dnl
 dnl  Stuff used by the program
 dnl
 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")
+AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN", [Simple version string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VERSION $CODENAME - (c) 1996-2002 VideoLAN", [Copyright string])

 
 

-VLC_SYMBOL="`echo ${VLC_VERSION} | tr .- __`"
-AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__MODULE_$VLC_SYMBOL")
-AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $VLC_SYMBOL)
+VLC_SYMBOL="`echo ${VERSION} | tr .- __`"
+AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__MODULE_$VLC_SYMBOL", [String suffix for module functions])
+AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $VLC_SYMBOL, [Symbol suffix for module functions])

 
 DATA_PATH="${ac_tool_prefix}/share/videolan"
 AC_SUBST(DATA_PATH)
 
 DATA_PATH="${ac_tool_prefix}/share/videolan"
 AC_SUBST(DATA_PATH)


@@ -1521,7 +1573,6 @@ AC_SUBST(ARCH)
 AC_SUBST(PLUGINS)
 AC_SUBST(BUILTINS)
 AC_SUBST(ALIASES)
 AC_SUBST(PLUGINS)
 AC_SUBST(BUILTINS)
 AC_SUBST(ALIASES)

-AC_SUBST(INCLUDE)

 AC_SUBST(DEBUG)
 AC_SUBST(ASM)
 AC_SUBST(CPROF)
 AC_SUBST(DEBUG)
 AC_SUBST(ASM)
 AC_SUBST(CPROF)


@@ -1531,134 +1582,106 @@ AC_SUBST(TUNING)
 AC_SUBST(RELEASE)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
 AC_SUBST(RELEASE)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)

-AC_SUBST(DLL_PATH)
+AC_SUBST(BCBUILDER)

 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)

-AC_SUBST(VCD_DEVICE)
-AC_SUBST(DVD_DEVICE)
+AC_SUBST(NEED_GETOPT)

 
 

-AC_SUBST(LDFLAGS)
-AC_SUBST(PLDFLAGS)
-AC_SUBST(SOFLAGS)
-
-AC_SUBST(LIB)
-AC_SUBST(LIB_ALSA)
-AC_SUBST(LIB_ARTS)
-AC_SUBST(LIB_BEOS)
-AC_SUBST(LIB_DARWIN)
-AC_SUBST(LIB_DIRECTX)
-AC_SUBST(LIB_DSP)
-AC_SUBST(LIB_DVD)
-AC_SUBST(LIB_DVDREAD)
-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_IPV4)
-AC_SUBST(LIB_IPV6)
-AC_SUBST(LIB_KDE)
-AC_SUBST(LIB_A52)
-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_VCD)
-AC_SUBST(LIB_WAVEOUT)
-AC_SUBST(LIB_WIN32)
-AC_SUBST(LIB_X11)
-AC_SUBST(LIB_XVIDEO)
-
-AC_SUBST(CFLAGS_VLC)
-AC_SUBST(CFLAGS_ARTS)
-AC_SUBST(CFLAGS_DVD)
-AC_SUBST(CFLAGS_DVDREAD)
-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_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(SRC_DVD_EXTRA)
-AC_SUBST(SRC_DVDCSS_EXTRA)
+AC_SUBST(LDFLAGS)

 
 

-AC_SUBST(NEED_GETOPT)
-AC_SUBST(NEED_LIBDVDCSS)
+AC_SUBST(vlc_CFLAGS)
+AC_SUBST(plugins_CFLAGS)
+AC_SUBST(builtins_CFLAGS)
+
+AC_SUBST(a52_CFLAGS)
+AC_SUBST(arts_CFLAGS)
+AC_SUBST(dvd_CFLAGS)
+AC_SUBST(dvdread_CFLAGS)
+AC_SUBST(mpeg_ts_dvbpsi_CFLAGS)
+AC_SUBST(directx_CFLAGS)
+AC_SUBST(esd_CFLAGS)
+AC_SUBST(ffmpeg_CFLAGS)
+AC_SUBST(glide_CFLAGS)
+AC_SUBST(gnome_CFLAGS)
+AC_SUBST(gtk_CFLAGS)
+AC_SUBST(kde_CFLAGS)
+AC_SUBST(idctaltivec_CFLAGS)
+AC_SUBST(macosx_CFLAGS)
+AC_SUBST(mad_CFLAGS)
+AC_SUBST(memcpyaltivec_CFLAGS)
+AC_SUBST(motionaltivec_CFLAGS)
+AC_SUBST(qt_CFLAGS)
+AC_SUBST(sdl_CFLAGS)
+AC_SUBST(x11_CFLAGS)
+AC_SUBST(xvideo_CFLAGS)
+
+AC_SUBST(vlc_LDFLAGS)
+AC_SUBST(plugins_LDFLAGS)
+AC_SUBST(builtins_LDFLAGS)
+
+AC_SUBST(a52_LDFLAGS)
+AC_SUBST(aa_LDFLAGS)
+AC_SUBST(alsa_LDFLAGS)
+AC_SUBST(arts_LDFLAGS)
+AC_SUBST(beos_LDFLAGS)
+AC_SUBST(chroma_i420_rgb_LDFLAGS)
+AC_SUBST(directx_LDFLAGS)
+AC_SUBST(dsp_LDFLAGS)
+AC_SUBST(dvd_LDFLAGS)
+AC_SUBST(dvdread_LDFLAGS)
+AC_SUBST(mpeg_ts_dvbpsi_LDFLAGS)
+AC_SUBST(esd_LDFLAGS)
+AC_SUBST(filter_distort_LDFLAGS)
+AC_SUBST(ffmpeg_LDFLAGS)
+AC_SUBST(ggi_LDFLAGS)
+AC_SUBST(glide_LDFLAGS)
+AC_SUBST(gnome_LDFLAGS)
+AC_SUBST(gtk_LDFLAGS)
+AC_SUBST(idctaltivec_LDFLAGS)
+AC_SUBST(imdct_LDFLAGS)
+AC_SUBST(imdct3dn_LDFLAGS)
+AC_SUBST(imdctsse_LDFLAGS)
+AC_SUBST(ipv4_LDFLAGS)
+AC_SUBST(kde_LDFLAGS)
+AC_SUBST(lirc_LDFLAGS)
+AC_SUBST(macosx_LDFLAGS)
+AC_SUBST(mad_LDFLAGS)
+AC_SUBST(memcpyaltivec_LDFLAGS)
+AC_SUBST(motionaltivec_LDFLAGS)
+AC_SUBST(ncurses_LDFLAGS)
+AC_SUBST(qnx_LDFLAGS)
+AC_SUBST(qt_LDFLAGS)
+AC_SUBST(rc_LDFLAGS)
+AC_SUBST(sdl_LDFLAGS)
+AC_SUBST(vcd_LDFLAGS)
+AC_SUBST(vorbis_LDFLAGS)
+AC_SUBST(waveout_LDFLAGS)
+AC_SUBST(x11_LDFLAGS)
+AC_SUBST(xvideo_LDFLAGS)

 
 AC_OUTPUT([Makefile.opts po/Makefile.in])
 
 echo "
 
 AC_OUTPUT([Makefile.opts po/Makefile.in])
 
 echo "

-global configuration
+vlc configuration

 --------------------
 --------------------

+vlc version           : ${VERSION}

 system                : ${SYS}
 architecture          : ${ARCH}
 optimizations         : ${OPTIMS}
 system                : ${SYS}
 architecture          : ${ARCH}
 optimizations         : ${OPTIMS}

-tuning:               : ${TUNING}
-release:              : ${RELEASE}"
-
-if test x${HAVE_VLC} = x1
-then
-  echo "
-vlc configuration
------------------
-vlc version           : ${VLC_VERSION}
+tuning                : ${TUNING}

 debug mode            : ${DEBUG}
 debug mode            : ${DEBUG}

+release               : ${RELEASE}

 cprof/gprof support   : ${CPROF}/${GPROF}
 need builtin getopt   : ${NEED_GETOPT}
 built-in modules      :${BUILTINS}
 plug-in modules       :${PLUGINS}
 cprof/gprof support   : ${CPROF}/${GPROF}
 need builtin getopt   : ${NEED_GETOPT}
 built-in modules      :${BUILTINS}
 plug-in modules       :${PLUGINS}

-vlc aliases           :${ALIASES}"
-fi
-
-echo "
-libdvdcss configuration
------------------------
-can be built          : ${CAN_BUILD_LIBDVDCSS}
-will be built         : ${NEED_LIBDVDCSS}"
-if test x${NEED_LIBDVDCSS} = x1
-then
-  echo "need BSDI libdvd      : ${NEED_BSDI_LIBDVD}"
-  echo "link statically       : ${STATIC_LIBDVDCSS}"
-else
-  echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
-fi
+vlc aliases           :${ALIASES}

 
 

-echo "

 You may now tune Makefile.opts at your convenience, for instance to choose
 which modules get compiled as plugins.
 You may now tune Makefile.opts at your convenience, for instance to choose
 which modules get compiled as plugins.

+
+To build vlc and its plugins, type \`$VLC_MAKE'.

 "
 "

-if test x${HAVE_VLC} = x1
-then
-  echo "To build vlc and its plugins, type \`make'."
-fi
-if test x${NEED_LIBDVDCSS} = x1
-then
-  echo "To build libdvdcss only, type \`make libdvdcss'."
-fi
-echo ""