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_access_mms="${LDFLAGS_mms} -lws2_32"
- LDFLAGS_access_rtp="${LDFLAGS_rtp} -lws2_32"
- LDFLAGS_access_udp="${LDFLAGS_udp} -lws2_32"
+ LDFLAGS_access_http="${LDFLAGS_access_http} -lws2_32"
+ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lws2_32"
+ LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lws2_32"
+ LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32"
LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
fi
;;
CFLAGS_mingw32_special="-fnative-struct"
fi
- CFLAGS_save="${CFLAGS_save} ${CFLAGS_mingw32_special}"; CFLAGS="${CFLAGS_save}"
+ CFLAGS_save="${CFLAGS_save} ${CFLAGS_mingw32_special}";
+ CXXFLAGS_save="${CXXFLAGS_save} ${CFLAGS_mingw32_special}";
+ CFLAGS="${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
+fi
+
+dnl Check for fvtable-thunks support for mingw32
+if test x$SYS = xmingw32
+then
+AC_LANG_PUSH(C++)
+ AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks],
+ [ac_cv_cxx_fvtable_thunks],
+ [CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks"
+ AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes,
+ ac_cv_cxx_fvtable_thunks=no)])
+ if test x"$ac_cv_cxx_fvtable_thunks" = x"yes"; then
+ CXXFLAGS_mingw32_special="-fvtable-thunks"
+ fi
+
+ CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"
+ CXXFLAGS="${CXXFLAGS_save}"
+AC_LANG_POP(C++)
fi
dnl Flags for plugin compilation
case "x${SYS}" in
xmingw32|xcygwin)
CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}"
- CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special}"
+ CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}"
CFLAGS_plugins="${CFLAGS_plugins} ${CFLAGS_mingw32_special}"
- CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special}"
+ CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}"
;;
x*)
AC_CHECK_FUNC(send,,[
AC_CHECK_LIB(socket,send,
- LDFLAGS_http="${LDFLAGS_http} -lsocket"
- LDFLAGS_mms="${LDFLAGS_mms} -lsocket"
- LDFLAGS_rtp="${LDFLAGS_rtp} -lsocket"
- LDFLAGS_udp="${LDFLAGS_udp} -lsocket"
+ LDFLAGS_access_http="${LDFLAGS_access_http} -lsocket"
+ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket"
+ LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lsocket"
+ LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket"
)])
AC_CHECK_FUNC(gethostbyname,,[
AC_CHECK_LIB(dl,dlopen,LDFLAGS_vlc="${LDFLAGS_vlc} -ldl")
AC_CHECK_LIB(m,cos,
LDFLAGS_imdct="${LDFLAGS_imdct} -lm"
- LDFLAGS_filter_distort="${LDFLAGS_filter_distort} -lm")
+ LDFLAGS_filter_distort="${LDFLAGS_filter_distort} -lm"
+ LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} -lm")
AC_CHECK_LIB(m,pow,
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lm"
LDFLAGS_imdct="${LDFLAGS_imdct} -lm"
AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)])
if test "x${ac_cv_c_Wall_Winline}" != "xno"; then
CFLAGS_save="-Wall -Winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="-Wall -Winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
+ CXXFLAGS_save="-Wall ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wall -Winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
else
AC_CACHE_CHECK([if \$CC accepts -wall -winline],
PLUGINS="${PLUGINS} idct idctclassic motion mpeg_video spudec mpeg_audio"
#PLUGINS="${PLUGINS} a52old imdct downmix"
PLUGINS="${PLUGINS} lpcm a52"
-PLUGINS="${PLUGINS} deinterlace invert yuv wall transform distort clone crop motionblur"
-PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofloat32"
+PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur"
+PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler"
PLUGINS="${PLUGINS} trivial_channel_mixer"
PLUGINS="${PLUGINS} trivial_mixer spdif_mixer float32_mixer"
#PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3 m3u"
-PLUGINS="${PLUGINS} wav araw demuxdump"
+PLUGINS="${PLUGINS} wav araw demuxdump demuxsub"
dnl
dnl Network modules
dnl libdvbpsi ts demux
dnl
AC_ARG_ENABLE(dvbpsi,
-[ --enable-dvbpsi dvbpsi ts demux module (default disabled)])
+[ --enable-dvbpsi dvbpsi ts demux module (default enabled)])
if test "x${enable_dvbpsi}" != "xno"
then
AC_ARG_WITH(dvbpsi,
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
[ PLUGINS="${PLUGINS} ts_dvbpsi"
- LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" ], [],
- [ AC_MSG_ERROR([cannot find libdvbpsi headers]) ])
+ LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" ],
+ [ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
+ [#include <stdint.h>
+#include <dvbpsi/dvbpsi.h>
+#include <dvbpsi/descriptor.h>
+#include <dvbpsi/pat.h>
+#include <dvbpsi/pmt.h>])
else
AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree})
real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`"
if test "x${enable_ogg}" != "xno"
then
AC_CHECK_HEADERS(ogg/ogg.h, [
- PLUGINS="${PLUGINS} ogg"
- LDFLAGS_ogg="${LDFLAGS_ogg} -logg"
+ AC_CHECK_LIB( ogg, oggpack_read, [
+ PLUGINS="${PLUGINS} ogg"
+ LDFLAGS_ogg="${LDFLAGS_ogg} -logg"
+ AC_CHECK_LIB( ogg, oggpackB_read, [
+ CPPFLAGS_ogg="${CPPFLAGS_ogg} -DHAVE_OGGPACKB"])])
],[])
fi
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}"
AC_CHECK_LIB(a52, a52_free, [
BUILTINS="${BUILTINS} a52tofloat32"
- LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} -la52 -lm"
+ LDFLAGS_a52tofloat32="-la52 ${LDFLAGS_a52tofloat32}"
CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} -DUSE_A52DEC_TREE"
],[
if test -f ${real_a52_tree}/liba52/.libs/liba52.a
else
AC_MSG_ERROR([the specified tree hasn't been compiled])
fi
- ],[-lm])
+ ])
LDFLAGS="${LDFLAGS_save}"
else
AC_MSG_RESULT(no)
AC_CHECK_HEADERS(a52dec/a52.h, [
AC_CHECK_LIB(a52, a52_free, [
PLUGINS="${PLUGINS} a52tofloat32"
- LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} ${LDFLAGS_test} -la52 -lm"
+ LDFLAGS_a52tofloat32="${LDFLAGS_test} -la52 ${LDFLAGS_a52tofloat32}"
CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} ${CPPFLAGS_test}"
],[
if test "x${enable_dvbpsi}" != "x"
then
AC_MSG_ERROR([Could not find a52 on your system: you may get it from http://liba52.sf.net])
fi
- ],[-lm])
+ ])
])
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS="${LDFLAGS_save}"
dnl Vorbis plugin
dnl
AC_ARG_ENABLE(vorbis,
- [ --enable-vorbis Vorbis decoder support (default enabled)])
+ [ --enable-vorbis Vorbis decoder support (default enabled)])
if test "x${enable_vorbis}" != "xno"
then
AC_CHECK_HEADERS(vorbis/codec.h, [
],[])
fi
+dnl
+dnl Tremor plugin
+dnl
+AC_ARG_ENABLE(tremor,
+ [ --enable-tremor Tremor decoder support (default disabled)])
+if test "x${enable_tremor}" = "xyes"
+then
+ AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [
+ PLUGINS="${PLUGINS} tremor"
+ LDFLAGS_tremor="${LDFLAGS_tremor} -lvorbisidec -logg"
+ ],[])
+fi
+
+dnl
+dnl tarkin decoder plugin
+dnl
+AC_ARG_ENABLE(tarkin,
+[ --enable-tarkin experimental tarkin codec (default disabled)])
+if test "x${enable_tarkin}" = "xyes"
+then
+ AC_ARG_WITH(tarkin-tree,
+ [ --with-tarkin-tree=PATH tarkin tree for static linking])
+ if test "x${with_tarkin_tree}" != "x"
+ then
+ AC_MSG_CHECKING(for tarkin.o in ${with_tarkin_tree})
+ real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
+ if test -f "${real_tarkin_tree}/tarkin.o"
+ then
+ BUILTINS="${BUILTINS} tarkin"
+ CPPFLAGS_tarkin="${CPPFLAGS_tarkin} -I${real_tarkin_tree}"
+ LDFLAGS_tarkin="${LDFLAGS_tarkin} ${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg"
+ AC_MSG_RESULT(yes)
+ else
+ dnl The given tarkin tree wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_tarkin_tree}/tarkin.o,
+ make sure you compiled tarkin in ${with_tarkin_tree}])
+ fi
+ fi
+fi
+
+dnl
+dnl theora decoder plugin
+dnl
+AC_ARG_ENABLE(theora,
+[ --enable-theora experimental theora codec (default disabled)])
+if test "x${enable_theora}" = "xyes"
+then
+ AC_CHECK_HEADERS(theora/theora.h, [
+ AC_CHECK_LIB(theora, theora_granule_time, [
+ BUILTINS="${BUILTINS} theora"
+ LDFLAGS_theora="${LDFLAGS_theora} -logg -ltheora" ],[
+ AC_MSG_ERROR([libtheora doesn't appear to be installed on you system.
+You also need to check that you have a libogg posterior to the 1.0 release.])],
+ [-logg])
+ ])
+fi
+
dnl
dnl Video plugins
dnl
fi
fi
+dnl
+dnl win32 GDI plugin
+dnl
+AC_ARG_ENABLE(wingdi,
+ [ --enable-wingdi Win32 GDI module (default enabled on Win32)])
+if test "x${enable_wingdi}" != "xno"; then
+ if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
+ PLUGINS="${PLUGINS} wingdi"
+ LDFLAGS_wingdi="${LDFLAGS_wingdi} -lgdi32"
+ fi
+fi
+
dnl
dnl Audio plugins
dnl
AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
if test "x${have_alsa}" = "xtrue"
then
- PLUGINS="${PLUGINS} alsa"
+ #PLUGINS="${PLUGINS} alsa"
LDFLAGS_alsa="${LDFLAGS_alsa} -lasound -lm -ldl"
fi
fi])
CPPFLAGS="${CPPFLAGS_save}"
fi])
+dnl
+dnl wxWindows module
+dnl
+AC_ARG_ENABLE(wxwindows,
+ [ --enable-wxwindows wxWindows support (default enabled)])
+if test "x${enable_wxwindows}" != "xno"
+then
+ WXWINDOWS_PATH="${PATH}"
+ AC_ARG_WITH(wx-config-path,
+ [ --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
+ [ if test "x${with_wx_config_path}" != "xno"
+ then
+ WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
+ fi ])
+ # look for wx-config
+ AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
+ if test "x${WX_CONFIG}" != "xno"
+ then
+ if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
+ then
+ AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwindows.])
+ fi
+ CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cflags`"
+ LDFLAGS_wxwindows="${LDFLAGS_wxwindows} `${WX_CONFIG} --libs`"
+ # now look for the wxprec.h header
+ CPPFLAGS="${save_CPPFLAGS} ${CXXFLAGS_wxwindows}"
+ ac_cv_wx_headers=yes
+ AC_CHECK_HEADERS(wx/wxprec.h, , [
+ ac_cv_wx_headers=no
+ echo "Cannot find wxWindows development headers."
+ ])
+ if test "x${ac_cv_wx_headers}" = "xyes"
+ then
+ PLUGINS="${PLUGINS} wxwindows"
+ ALIASES="${ALIASES} wxvlc"
+ fi
+ CPPFLAGS="${save_CPPFLAGS}"
+ fi
+fi
+
dnl
dnl Qt module
dnl
AC_SUBST(CFLAGS_vlc)
AC_SUBST(CFLAGS_pics)
+AC_SUBST(CXXFLAGS_pics)
AC_SUBST(CFLAGS_plugins)
+AC_SUBST(CXXFLAGS_plugins)
AC_SUBST(CFLAGS_builtins)
AC_SUBST(CPPFLAGS_mozilla)
projects / vlc / blobdiff