Commit 6d8b08a4 authored by Sam Hocevar's avatar Sam Hocevar

  * ./configure.in: fixed a bug in the libdvdread detection.
  * ./configure.in: fixed plugin compilation under Win32.
parent 45c8658e
......@@ -10,6 +10,7 @@ vlc-debug.ct
config.log
config.cache
config.status
confdefs.h
Makefile.opts
Makefile.modules
build-stamp
......
......@@ -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.
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment