* ./configure.in: fixed a bug in the libdvdread detection.

  * ./configure.in: fixed plugin compilation under Win32.

diff --git a/.cvsignore b/.cvsignore
index 667a889e5c87fcf1de3512b4af6362c6b20f55bf..591350fbf07387bbf5a74513b0af4f58749ae174 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,6 +10,7 @@ vlc-debug.ct
 config.log
 config.cache
 config.status
+confdefs.h
 Makefile.opts
 Makefile.modules
 build-stamp

diff --git a/ChangeLog b/ChangeLog
index 784c9734700db0386e23e82f1f9384502a77b50a..4fa96676e8e5bab983cc18c0ed4cfd27742ab605 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 HEAD
 
+  * ./configure.in: fixed a bug in the libdvdread detection.
+  * ./configure.in: fixed plugin compilation under Win32.
   * ./vlc.spec: imported MandrakeSoft's enhancements.
   * ./doc/developer/decoders.xml: fixed a typo preventing compilation.
   * ./plugins/aa/aa.c: we now parse the AAOPTS environment variable.

diff --git a/configure b/configure
index 87ed0ae00960c63ccb6fdd5311c42a2382861c88..80132b2310471c606dc6d0f61324db32f38b7f80 100755 (executable)
--- a/configure
+++ b/configure
@@ -3238,7 +3238,7 @@ fi
 fi
 
     save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long"
-    save_LDFLAGS="${save_LDFLAGS} -mwindows -Xlinker --force-exe-suffix"
+    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"
@@ -5869,7 +5869,7 @@ if test "${enable_dvdread+set}" = set; then
   :
 fi
 
-if test "x$enableval" != "xno"
+if test "x$enable_dvdread" != "xno"
 then
   # Check whether --with-dvdread or --without-dvdread was given.
 if test "${with_dvdread+set}" = set; then
@@ -5941,7 +5941,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-          if test "x$enableval" != x
+          if test "x$enable_dvdread" != x
           then
             { echo "configure: error: Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later" 1>&2; exit 1; }
           fi
@@ -5951,7 +5951,7 @@ rm -f conftest*
   
 else
   echo "$ac_t""no" 1>&6
-if test "x$enableval" != x
+if test "x$enable_dvdread" != x
     then
       if test "x$withval" != x
       then

diff --git a/configure.in b/configure.in
index 0de1ca1703de0b176f79a5ea64d3d766b6d9e9a4..c8da5ef45d9985c1783817e54c37997c51a40d27 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -76,7 +76,7 @@ case x"${target_os}" in
     SYS=mingw32
     AC_CHECK_TOOL(WINDRES, windres, :)
     save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long"
-    save_LDFLAGS="${save_LDFLAGS} -mwindows -Xlinker --force-exe-suffix"
+    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"
@@ -641,7 +641,7 @@ dnl dvdread module: check for libdvdread plugin
 dnl
 AC_ARG_ENABLE(dvdread,
 [  --enable-dvdread        dvdread input module (default disabled)])
-if test "x$enableval" != "xno"
+if test "x$enable_dvdread" != "xno"
 then
   AC_ARG_WITH(dvdread, 
   [    --with-dvdread=PATH   libdvdread headers and libraries])
@@ -661,13 +661,13 @@ then
           dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread"
           dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}"
         ],[
-          if test "x$enableval" != x
+          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$enableval" != x
+    if test "x$enable_dvdread" != x
     then
       if test "x$withval" != x
       then