LDFLAGS_vlc="${LDFLAGS_vlc} -all_load"
LIBEXT=".dylib"
;;
- x*mingw32*)
- SYS=mingw32
- AC_CHECK_TOOL(WINDRES, windres, :)
- CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
- LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows -Xlinker --force-exe-suffix"
- LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
- LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
- LDFLAGS_access_http="${LDFLAGS_http} -lws2_32"
- LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
- LIBEXT=".dll"
- ;;
- x*cygwin*)
- SYS=cygwin
+ x*mingw32* | x*cygwin*)
AC_CHECK_TOOL(WINDRES, windres, :)
LIBEXT=".dll"
+
+ case "x${target_os}" in
+ x*mingw32*)
+ SYS=mingw32
+ ;;
+ x*cygwin*)
+ dnl Check if we are using the mno-cygwin mode in which case we are
+ dnl actually dealing with a mingw32 compiler.
+ AC_EGREP_CPP(yes,
+ [#ifdef WIN32
+ yes
+ #endif],
+ SYS=mingw32, SYS=cygwin)
+ ;;
+ esac
+
+ if test "x$SYS" = "xmingw32"; then
+ CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
+ CPPFLAGS="${CPPFLAGS_save}"
+ LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows"
+ LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
+ LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
+ LDFLAGS_access_http="${LDFLAGS_http} -lws2_32"
+ LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
+ fi
;;
x*nto*)
SYS=nto
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CXXFLAGS="${CXXFLAGS_save}"
LDFLAGS_vlc="${LDFLAGS_vlc} -lbe"
LDFLAGS_plugins="${LDFLAGS_plugins} -nostart"
- LDFLAGS_beos="${LDFLAGS_beos} -lbe -lgame -lroot -ltracker -lstdc++.r4 -ltranslation"
+ LDFLAGS_beos="${LDFLAGS_beos} -lbe -lmedia -lroot -ltracker -lstdc++.r4 -ltranslation"
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"
;;
x*)
AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
+dnl Check for the need to include the mingwex lib for mingw32
+if test x$SYS = xmingw32
+then
+ AC_CHECK_LIB(mingwex,opendir,
+ AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}",
+ [LDFLAGS_vlc="${LDFLAGS_vlc} -lmingwex"
+ LDFLAGS_gtk="${LDFLAGS_gtk} -lmingwex"])
+ )
+fi
+
dnl Check for fnative-struct or mms-bitfields support for mingw32
if test x$SYS = xmingw32
then
#PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3"
+PLUGINS="${PLUGINS} wav araw"
dnl
dnl Network modules
[ --enable-directx Win32 DirectX support (default enabled on Win32)])
if test "x${enable_directx}" != "xno"
then
- if test "x${SYS}" = "xmingw32"
+ if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"
then
AC_ARG_WITH(directx,
[ --with-directx=PATH Win32 DirectX headers])
if test "x${with_directx}" = "x"
then
AC_CHECK_HEADERS(ddraw.h,
- [ PLUGINS="${PLUGINS} directx"
- LDFLAGS_directx="${LDFLAGS_directx} -lgdi32" ])
+ [ PLUGINS="${PLUGINS} vout_directx aout_directx"
+ LDFLAGS_vout_directx="${LDFLAGS_directx} -lgdi32" ])
else
AC_MSG_CHECKING(for directX headers in ${with_directx})
if test -f ${with_directx}/ddraw.h
then
- PLUGINS="${PLUGINS} directx"
- LDFLAGS_directx="${LDFLAGS_directx} -lgdi32"
- CPPFLAGS_directx="${CPPFLAGS_directx} -I${with_directx}"
+ PLUGINS="${PLUGINS} vout_directx aout_directx"
+ LDFLAGS_vout_directx="${LDFLAGS_directx} -lgdi32"
+ CPPFLAGS_vout_directx="${CPPFLAGS_vout_directx} -I${with_directx}"
+ CPPFLAGS_aout_directx="${CPPFLAGS_aout_directx} -I${with_directx}"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
dnl
AC_ARG_ENABLE(waveout,
[ --enable-waveout Win32 waveOut module (default enabled on Win32)])
-if test "x${enable_waveout}" != "xno" -a "x${SYS}" = "xmingw32"
- then
+if test "x${enable_waveout}" != "xno"; then
+ if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
PLUGINS="${PLUGINS} waveout"
LDFLAGS_waveout="-lwinmm"
+ fi
fi
dnl
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 gthread`"
- LDFLAGS_gtk="${LDFLAGS_gtk} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`"
+ if test "x${SYS}" != "xmingw32"; then
+ CFLAGS_gtk="${CFLAGS_gtk} `${GTK_CONFIG} --cflags gtk gthread`"
+ LDFLAGS_gtk="${LDFLAGS_gtk} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`"
+ else
+ CFLAGS_gtk="${CFLAGS_gtk} `${GTK_CONFIG} --cflags gtk`"
+ LDFLAGS_gtk="${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
fi])
])
-LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
-LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
+if test "x${SYS}" != "xmingw32"; then
+ LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
+ LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
+fi
dnl
dnl Mozilla plugin
[ --enable-testsuite build test modules (default disabled)])
if test "x${enable_testsuite}" = "xyes"
then
- TESTS="test1 test2 test3"
+ TESTS="test1 test2 test3 test4"
+
dnl we define those so that bootstrap sets the right linker
CXXFLAGS_test2="${CXXFLAGS_test2}"
OBJCFLAGS_test3="${OBJCFLAGS_test3}"
dnl this one is needed until automake knows what to do
LDFLAGS_test3="${LDFLAGS_test3} -lobjc"
+
PLUGINS="${PLUGINS} ${TESTS}"
- BUILTINS="${BUILTINS} ${TESTS}"
+ #BUILTINS="${BUILTINS} ${TESTS}"
fi
dnl
then
for plugin in `echo ${PLUGINS}`
do
- typeset ${plugin}_plugin=yes
+ eval "${plugin}_plugin=yes"
done
else
BUILTINS="${BUILTINS} ${PLUGINS}"
builtin_support=:
for builtin in `echo ${BUILTINS}`
do
- typeset ${builtin}_builtin=yes
+ eval "${builtin}_builtin=yes"
done
fi]
AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support})
dnl
dnl Stuff used by the program
dnl
-AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc ${VERSION} ${CODENAME} Copyright 1996-2002 VideoLAN", [Simple version string])
+AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2002 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
projects / vlc / blobdiff