CONFIGURE_LINE="$0 $*"
CODENAME="Janus"
-AC_PREREQ(2.50)
+AC_PREREQ(2.59)
AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM
-dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
-dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.8.6-svn)
+AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2])
AM_CONFIG_HEADER(config.h)
dnl Too many people are not aware of maintainer mode:
dnl
dnl Check for tools
dnl
-AC_PROG_CC
+AC_PROG_CC_C99
+AC_USE_SYSTEM_EXTENSIONS
AM_PROG_CC_C_O
-AC_PROG_CPP
AC_PROG_CXX
-eval "${CXX} --version" >/dev/null 2>&1 || CXX=""
-if test "${CXX}" != ""; then
- AC_PROG_CXXCPP
-fi
+AC_PROG_OBJC
+_AM_DEPENDENCIES([OBJC])
+AC_PROG_EGREP
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AM_PROG_AS
-dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
-dnl now otherwise it might be set in an obscure if statement.
-AC_EGREP_CPP(foo,foo)
-
-dnl AC_PROG_OBJC doesn't seem to exist, this is the KDE workaround
-AC_MSG_CHECKING(for an Objective-C compiler)
-OBJC="${CXX}"
-AC_SUBST(OBJC)
-OBJCFLAGS="${CXXFLAGS} -fgnu-runtime -fconstant-string-class=NSConstantString"
-AC_SUBST(OBJCFLAGS)
-dnl _AM_DEPENDENCIES(OBJC) doesn't work, so hard code OBJCDEPMODE here
-#OBJCDEPMODE="depmode=gcc3"
-#AC_SUBST(OBJCDEPMODE)
-_AM_DEPENDENCIES(OBJC)
-AC_MSG_RESULT(not implemented yet)
-
dnl Find the right ranlib, even when cross-compiling
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(STRIP, strip, :)
AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_TOOL(LD, ld, :)
-AC_DISABLE_STATIC
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-AC_ARG_ENABLE(libtool,
- [ --enable-libtool use libtool (default disabled, EXPERIMENTAL)],
- [],[enable_libtool="no"])
-AM_CONDITIONAL(USE_LIBTOOL, [test "${enable_libtool}" != "no"])
-
dnl Check for compiler properties
AC_C_CONST
AC_C_INLINE
+AC_C_RESTRICT
dnl
dnl Check for the contrib directory
AC_ARG_WITH(contrib,
[ --without-contrib do not use the libraries in extras/contrib],[],[])
if test "${with_contrib}" != "no"; then
-
+ AC_MSG_CHECKING([for libs in extras/contrib])
topdir="`dirname $0`"
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
-
+ if test "`grep HOST ${topdir}/extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"; then
+ if test "${with_contrib}" = "yes"; then
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
+ fi
+ else
if test -d ${topdir}/extras/contrib/lib; then
+ AC_MSG_RESULT([yes])
export PATH=${topdir}/extras/contrib/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
CXXFLAGS_save="${CXXFLAGS_save} -I${topdir}/extras/contrib/include"
OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include"
- if test $build = $host -o $PKG_CONFIG_LIBDIR; then
+ if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then
export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH
else
export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig
if test -z $with_ffmpeg_config_path; then
with_ffmpeg_config_path=${topdir}/extras/contrib/bin;
fi
- if test -z $with_livedotcom_tree; then
- with_livedotcom_tree=${topdir}/extras/contrib/src/live
+ if test -z $with_live555_tree; then
+ with_live555_tree=${topdir}/extras/contrib/src/live
fi
if test -z $with_goom_tree; then
with_goom_tree=${topdir}/extras/contrib/src/goom
export LIBRARY_PATH=${topdir}/extras/contrib/lib:$LIBRARY_PATH
export BELIBRARIES=${topdir}/extras/contrib/lib:$BELIBRARIES
fi
+ else
+ AC_MSG_RESULT([no])
+ fi
fi
fi
dnl
;;
*mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
AC_CHECK_TOOL(WINDRES, windres, :)
+ enable_libtool="no"
case "${target_os}" in
*mingw32*)
VLC_ADD_CXXFLAGS([beos],[])
VLC_ADD_LDFLAGS([vlc logger],[-lbe])
VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
-
+ VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl])
+ VLC_ADD_LDFLAGS([access_file],[-lpoll])
+ LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${CFLAGS_save}"
dnl Check for BONE
if test -f /boot/beos/system/lib/libbind.so; then
VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket])
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
+dnl
+dnl Libtool
+dnl It's very bad, but our former custom system was worst
+dnl -- Courmisch
+dnl
+AC_DISABLE_STATIC
+AC_LIBTOOL_DLOPEN
+dnl AC_LIBTOOL_WIN32_DLL - couldn't get libtool to work on Win32 so far
+AC_PROG_LIBTOOL
+
+AC_ARG_ENABLE(libtool,
+ [ --enable-libtool use libtool (default disabled)])
+AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"])
+
+
dnl
dnl Check for Mac OS X SDK settings
dnl
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="ca da de en_GB es fr it ja ka ko nl oc pt_BR ro ru sv tr zh_CN zh_TW"
+ALL_LINGUAS="ca cs da de en_GB es fr gl he hi hu it ja ka ko nl oc pt_BR ro ru sv tr zh_CN zh_TW"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
-if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
- AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
- INCLUDES="${INCLUDES} -I\$(top_builddir)/intl"
+AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
+ AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl])
+ AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl"
AS_IF([test "${enable_libtool}" != "no"], [
INCLUDED_LIBINTL="${LTLIBINTL}"
],[
INCLUDED_LIBINTL="${LIBINTL}"
])
-else
- VLC_ADD_LDFLAGS([vlc],[${LIBINTL}])
- INCLUDED_LIBINTL=
-fi
+], [
+ AS_IF([test "${enable_libtool}" != "no"], [
+ VLC_ADD_LDFLAGS([vlc], [${LTLIBINTL}])
+ ], [
+ VLC_ADD_LDFLAGS([vlc], [${LIBINTL}])
+ ])
+])
AC_SUBST(INCLUDED_LIBINTL)
-XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
+XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
dnl
dnl Iconv stuff
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_TYPE_SIGNAL
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264 goom],[-lm])
+ VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual],[-lm])
])
AC_CHECK_LIB(m,pow,[
VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq vlc freetype mpc dmo quicktime realaudio galaktos],[-lm])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm])
])
+AC_CHECK_LIB(m,ceil,[
+ VLC_ADD_LDFLAGS([mosaic],[-lm])
+])
AC_CHECK_LIB(mx,sqrtf,[
VLC_ADD_LDFLAGS([x264],[-lmx])
])
dnl Don't link with rt when using GNU-pth
if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then
- dnl HP/UX port
- AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])])
+ AC_CHECK_LIB(rt, clock_nanosleep, [
+ VLC_ADD_LDFLAGS([vlc],[-lrt])
+ AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.])
+ ], [
+ dnl HP/UX port
+ AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])])
+ ])
have_nanosleep=false
AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
AC_HEADER_TIME
+AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])])
+
dnl Check for dirent
need_dirent=false
AC_CHECK_HEADERS(dirent.h,,[need_dirent=:])
AC_ARG_ENABLE(hal,
[ --enable-hal Linux HAL services discovery (default enabled)])
-if test "${enable_hal}" != "no" -a "${SYS}" = "linux"
+if test "${enable_hal}" != "no"
then
PKG_CHECK_MODULES(HAL, hal >= 0.5.0,
[ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API])
AC_DEFINE( HAVE_HAL, [], [Define if you have the HAL library] )
- VLC_ADD_PLUGINS([hal])
- VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
- VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
+ VLC_ADD_PLUGINS([hal probe_hal])
+ VLC_ADD_LDFLAGS([vlc hal probe_hal],[$HAL_LIBS])
+ VLC_ADD_CFLAGS([vlc hal probe_hal],[$HAL_CFLAGS])],
dnl No hal 0.5 Test for 0.2
[ PKG_CHECK_MODULES( HAL, hal >= 0.2.97,
[AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
dnl Check for dbus
AC_ARG_ENABLE(dbus,
- [ --enable-dbus Linux D-BUS message bus system (default enabled)])
+ [ --enable-dbus Linux D-BUS message bus system (default enabled)])
-if test "${enable_dbus}" != "no" -a "${SYS}" = "linux"
+if test "${enable_dbus}" != "no"
then
PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30,
[ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the new D-BUS library API])
# fi
#done
-AC_CACHE_CHECK([if \$CC accepts -Wall],
+AC_CACHE_CHECK([if $CC accepts -Wall],
[ac_cv_c_Wall],
[CFLAGS="-Wall ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
-AC_CACHE_CHECK([if \$CC accepts -Wconversion],
+AC_CACHE_CHECK([if $CC accepts -Wextra],
+ [ac_cv_c_Werror],
+ [CFLAGS="-Werror ${CFLAGS_save}"
+ AC_TRY_COMPILE([],,ac_cv_c_Werror=yes, ac_cv_c_Werror=no)])
+
+AC_CACHE_CHECK([if $CC accepts -Wconversion],
[ac_cv_c_Wconversion],
[CFLAGS="-Wconversion ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wconversion=yes, ac_cv_c_Wconversion=no)])
-AC_CACHE_CHECK([if \$CC accepts -Wunreachable-code],
+AC_CACHE_CHECK([if $CC accepts -Wunreachable-code],
[ac_cv_c_Wunreachable_code],
[CFLAGS="-Wunreachable-code ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wunreachable_code=yes, ac_cv_c_Wunreachable_code=no)])
-AC_CACHE_CHECK([if \$CC accepts -Wsign-compare],
+AC_CACHE_CHECK([if $CC accepts -Wsign-compare],
[ac_cv_c_Wsign_compare],
[CFLAGS="-Wsign-compare ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)])
OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
+if test "${ac_cv_c_Wextra}" != "no"; then
+ CFLAGS_save="-Wextra ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
+ CXXFLAGS_save="-Wextra ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS_save="-Wextra ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
+fi
+
if test "${ac_cv_c_Wsign_compare}" != "no"; then
CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
VLC_ADD_PLUGINS([dummy logger memcpy])
VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flac])
VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform distort motionblur rv32])
-VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32])
+VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32 mono])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
-VLC_ADD_PLUGINS([playlist export sgimb m3u nsc xtag])
+VLC_ADD_PLUGINS([playlist export sgimb nsc xtag])
VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv])
VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
+
if test "${SYS}" != "mingwce"; then
dnl VLC_ADD_PLUGINS([externrun])
VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record])
dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGINS([screensaver])
+ VLC_ADD_PLUGINS([screensaver motion])
elif test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([ntservice access_smb dmo msn])
VLC_ADD_LDFLAGS([dmo],[-lole32])
VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
- ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+ if test "${ac_cv_altivec_inline}" = "no"; then
+ ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+ fi
fi
AC_CACHE_CHECK([if linker needs -framework vecLib],
dnl
AC_ARG_WITH(tuning,
[ --with-tuning=ARCH enable special tuning for an architecture
- (default Pentium 2 on IA-32 and 750 on PPC)])
+ (default Pentium 2 on IA-32 and G4 on PPC)])
if test -n "${with_tuning}"; then
if test "${with_tuning}" != "no"; then
CFLAGS_TUNING="-mtune=${with_tuning}"
elif test "${target_cpu}" = "x86_64"; then
CFLAGS_TUNING="-mtune=athlon64"
elif test "${target_cpu}" = "powerpc"; then
- CFLAGS_TUNING="-mtune=750";
+ CFLAGS_TUNING="-mtune=G4";
fi
fi
test "${enable_debug}" != "yes" && enable_debug="no"
AH_TEMPLATE(NDEBUG,
[Define to 1 if debug code should NOT be compiled])
-AS_IF([test "x${enable_debug}" == "xno"], [AC_DEFINE(NDEBUG)])
+AS_IF([test "x${enable_debug}" = "xno"], [AC_DEFINE(NDEBUG)])
dnl
dnl Enable release-specific flags
dnl
dnl Is the shared libvlc forced ?
dnl
-build_pic=no
AC_ARG_ENABLE(shared-libvlc,
[ --enable-shared-libvlc Win32 libvlc.dll build (default disabled)])
AS_IF([test "${enable_libtool}" != "no" && test "${enable_shared_libvlc}"], [
VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp])
VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge])
# VLC_ADD_PLUGINS([stream_out_transrate])
+ VLC_ADD_PLUGINS([profile_parser])
AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
fi
+AC_ARG_ENABLE(switcher,
+ [ --enable-switcher Stream-out switcher plugin (default disabled)])
+
dnl Check for libshout
AC_ARG_ENABLE(shout,
[ --enable-shout libshout output plugin (default disabled)])
PKG_CHECK_MODULES(SHOUT, shout >= 2.1,
[AC_DEFINE(HAVE_SHOUT, [], [Define if you have the libshout library])
VLC_ADD_PLUGINS([access_output_shout])
- VLC_ADD_LDFLAGS([vlc access_output_shout],[$SHOUT_LIBS])
- VLC_ADD_CFLAGS([vlc access_output_shout],[$SHOUT_CFLAGS])],
+ VLC_ADD_LDFLAGS([access_output_shout],[$SHOUT_LIBS])
+ VLC_ADD_CFLAGS([access_output_shout],[$SHOUT_CFLAGS])],
[AC_MSG_WARN(libshout library not found)])
fi
]
)
+dnl
+dnl Libnotify notification plugin
+dnl
+
+AC_ARG_ENABLE(notify,
+ [ --enable-notify libnotify notification plugin (default enabled)])
+AS_IF([test "${enable_notify}" != "no"], [
+ PKG_CHECK_MODULES(NOTIFY, libnotify,
+ [
+ VLC_ADD_PLUGINS([notify])
+ VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS])
+ VLC_ADD_LDFLAGS(notify, [$NOTIFY_LIBS])
+ ],[
+ AS_IF([test "${enable_notify}" = "yes"],[
+ AC_MSG_WARN( libnotify not found) ])
+ ])
+ ])
+
+
+
dnl
dnl Input plugins
AC_ARG_WITH(,[Input plugins:])
-dnl live.com input
+dnl live555 input
dnl
-AC_ARG_ENABLE(livedotcom,
-[ --enable-livedotcom live.com RTSP input plugin (default disabled)])
-if test "${enable_livedotcom}" = "yes"; then
- AC_ARG_WITH(livedotcom-tree,
- [ --with-livedotcom-tree=PATH live.com tree for static linking])
+if test "${enable_livedotcom}"
+then
+ AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
+fi
+
+if test "${enable_livedotcom}" = "yes"
+then
+ enable_live555="yes"
+fi
+AC_ARG_ENABLE(live555,
+[ --enable-live555 live555 RTSP input plugin (default disabled)])
+if test "${enable_live555}" = "yes"; then
+ AC_ARG_WITH(live555-tree,
+ [ --with-live555-tree=PATH live.com tree for static linking])
dnl
- dnl test for --with-livedotcom-tree
+ dnl test for --with-live555-tree
dnl
- if test -z "${with_livedotcom_tree}" -a "${CXX}" != ""; then
+ if test "${with_livedotcom_tree}"
+ then
+ AC_MSG_WARN(--with-livedotcom-tree is deprecated. Use --with-live555-tree instead.)
+ with_live555_tree="${with_livedotcom_tree}"
+ fi
+
+ if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}"
- CPPFLAGS_livedotcom="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+ CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
if test "${SYS}" = "solaris"; then
- CPPFLAGS_livedotcom="${CPPFLAGS_livedotcom} -DSOLARIS"
+ CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
fi
- CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_livedotcom}"
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
AC_CHECK_HEADERS(liveMedia.hh, [
- VLC_ADD_CXXFLAGS([livedotcom], [${CPPFLAGS_livedotcom}])
+ VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
AC_CHECK_LIB(liveMedia_pic, main, [
# We have -lliveMedia_pic, build plugins
- VLC_ADD_PLUGINS([livedotcom])
- VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
+ VLC_ADD_PLUGINS([live555])
+ VLC_ADD_LDFLAGS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
], [
AC_CHECK_LIB(liveMedia, main, [
# We only have -lliveMedia, do builtins
- VLC_ADD_BUILTINS([livedotcom])
- VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
+ VLC_ADD_BUILTINS([live555])
+ VLC_ADD_LDFLAGS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
])
])
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
- VLC_ADD_LDFLAGS([livedotcom],[-lws2_32])
+ VLC_ADD_LDFLAGS([live555],[-lws2_32])
fi
])
CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP(C++)
else
- AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_livedotcom_tree})
- real_livedotcom_tree="`cd ${with_livedotcom_tree} 2>/dev/null && pwd`"
- if test -z "${real_livedotcom_tree}"; then
+ AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_live555_tree})
+ real_live555_tree="`cd ${with_live555_tree} 2>/dev/null && pwd`"
+ if test -z "${real_live555_tree}"; then
dnl The given directory can't be found
AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_livedotcom_tree}])
+ AC_MSG_ERROR([cannot cd to ${with_live555_tree}])
fi
- if test -f "${real_livedotcom_tree}/liveMedia/libliveMedia.a"; then
- AC_MSG_RESULT(${real_livedotcom_tree}/liveMedia/libliveMedia.a)
+ if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then
+ AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
- VLC_ADD_BUILTINS([livedotcom])
+ VLC_ADD_BUILTINS([live555])
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
- VLC_ADD_LDFLAGS([livedotcom],[-lws2_32])
+ VLC_ADD_LDFLAGS([live555],[-lws2_32])
fi
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/liveMedia -lliveMedia])
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/groupsock -lgroupsock])
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/UsageEnvironment -lUsageEnvironment])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/groupsock -lgroupsock])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/BasicUsageEnvironment/include])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/groupsock/include])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/liveMedia/include])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/UsageEnvironment/include ])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/liveMedia/include])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/UsageEnvironment/include ])
if test "${SYS}" = "solaris"; then
- VLC_ADD_CXXFLAGS([livedotcom],[-DSOLARIS])
+ VLC_ADD_CXXFLAGS([live555],[-DSOLARIS])
fi
else
- dnl The given live.com wasn't built
+ dnl The given live555 wasn't built
AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_livedotcom_tree}/liveMedia/libliveMedia.a, make sure you compiled live.com in ${with_livedotcom_tree}])
+ AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}])
fi
fi
fi
fi
fi
+
+dnl
+dnl OpenCV wrapper and example filters
+dnl
+AC_ARG_ENABLE(opencv,
+ [ --enable-opencv OpenCV (computer vision) filter (default disabled)])
+if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
+then
+ AC_ARG_WITH(opencv-tree,
+ [ --with-opencv-tree=PATH opencv tree for linking])
+ if test -n "${with_opencv_tree}"
+ then
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
+ then
+ AC_MSG_CHECKING(for opencv in ${with_opencv_tree})
+ if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \
+ -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h
+ then
+ AC_MSG_RESULT(yes)
+ VLC_ADD_PLUGINS([opencv_wrapper])
+ VLC_ADD_LDFLAGS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
+ VLC_ADD_CFLAGS([opencv_wrapper],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
+ AC_LANG_PUSH(C++)
+ VLC_ADD_PLUGINS([opencv_example])
+ VLC_ADD_LDFLAGS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
+ VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
+ AC_LANG_POP(C++)
+ else
+ dnl No opencv could be found, sorry
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}])
+ fi
+ else
+ AC_MSG_WARN([--enable-opencv currently only works on windows])
+ fi
+ fi
+fi
+
+
dnl
dnl libsmbclient plugin
dnl
AC_CHECK_HEADERS(dvbpsi/dr.h,
[ VLC_ADD_PLUGINS([ts])
if test "${enable_sout}" != "no"; then
- VLC_ADD_BUILTINS([mux_ts])
+ VLC_ADD_PLUGINS([mux_ts])
fi
VLC_ADD_LDFLAGS([mux_ts ts dvb],[-ldvbpsi]) ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
CPPFLAGS="${CPPFLAGS_save}"
fi
+dnl
+dnl Video4Linux plugin
+dnl
+AC_ARG_ENABLE(v4l2,
+ [ --enable-v4l2 Video4Linux2 input support (default disabled)])
+if test "${enable_v4l2}" = "yes"
+then
+ AC_ARG_WITH(v4l2,
+ [ --with-v4l2=PATH path to a v4l2-enabled kernel tree],[],[])
+ if test "${with_v4l2}" != "no" -a -n "${with_v4l2}"
+ then
+ VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
+ fi
+
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
+ AC_CHECK_HEADERS(linux/videodev2.h, [
+ VLC_ADD_PLUGINS([v4l2])
+ ],[])
+ CPPFLAGS="${CPPFLAGS_save}"
+fi
+
+
dnl
dnl special access module for Hauppauge PVR cards
dnl
dnl
AC_ARG_ENABLE(gnomevfs,
[ --enable-gnomevfs GnomeVFS access module (default enabled)])
-if test "${enable_gnomevfs}" != "no" -a "${SYS}" = "linux"
+if test "${enable_gnomevfs}" != "no"
then
PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0,
VLC_ADD_LDFLAGS([access_gnomevfs],[$GNOMEVFS_LIBS])
if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then
VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a])
+ elif test -f "${real_ffmpeg_tree}/libpostproc/libpostproc.a"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a])
+ VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}])
else
dnl The given libavcodec wasn't built with --enable-pp
AC_MSG_RESULT(no)
- AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp])
+ AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-pp])
fi
fi
dnl Use a custom libffmpeg
fi
VLC_ADD_BUILTINS([ffmpeg])
- if test "${enable_sout}" != "no"; then
+ if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi
AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h)
VLC_ADD_PLUGINS([ffmpeg])
- if test "${enable_sout}" != "no"; then
+ if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then
VLC_ADD_PLUGINS([stream_out_switcher])
fi
VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`])
AC_CHECK_HEADERS(ffmpeg/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h)
- VLC_ADD_BUILTINS([ffmpeg])
- if test "${enable_sout}" != "no"; then
- VLC_ADD_BUILTINS([stream_out_switcher])
+ if test "${SYS}" = "darwin"; then
+ VLC_ADD_BUILTINS([ffmpeg])
+ else
+ VLC_ADD_PLUGINS([ffmpeg])
+ fi
+ if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then
+ if test "${SYS}" = "darwin"; then
+ VLC_ADD_BUILTINS([stream_out_switcher])
+ else
+ VLC_ADD_PLUGINS([stream_out_switcher])
+ fi
fi
VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}])
- VLC_ADD_LDFLAGS([ffmpeg],[${FFMPEG_LIBS}])
+ VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}])
dnl newer ffmpeg have a separate libpostproc
PKG_CHECK_MODULES(POSTPROC, libpostproc,[
VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}])
AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
- AC_CHECK_LIB(avutil, av_add_i, [
+ AC_CHECK_LIB(avutil, av_crc_init, [
VLC_ADD_LDFLAGS([ffmpeg],[-lavutil])
LDAVUTIL="-lavutil"])
AC_CHECK_LIB(avcodec, avcodec_init, [
VLC_ADD_BUILTINS([ffmpeg])
VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])
- if test "${enable_sout}" != "no"; then
+ if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi],
- [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
+ [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
AC_CHECK_LIB(avformat, av_open_input_stream, [
then
AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_granule_time, [
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_PLUGINS([theora])
- else
- VLC_ADD_BUILTINS([theora])
- fi
+ VLC_ADD_PLUGINS([theora])
theora_libs="-ltheora -logg"
VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[
AC_MSG_ERROR([libtheora doesn't appear to be installed on your system.
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
test "${enable_glx}" = "yes"); then
CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
- AC_CHECK_HEADERS(X11/Xlib.h, [
- AC_CHECK_HEADERS(GL/glx.h, [
+ AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h, [
VLC_ADD_PLUGINS([glx])
VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU])
VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}])
- ]) ])
+ ])
CPPFLAGS="${CPPFLAGS_save}"
fi
if test "${enable_opengl}" != "no" &&
test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then
if test "${SYS}" != "darwin"; then
- AC_CHECK_HEADERS(GL/gl.h, [
+ AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [
VLC_ADD_PLUGINS([opengl])
if test "${SYS}" != "mingw32"; then
VLC_ADD_LDFLAGS([opengl],[${X_LIBS} -lGL -lGLU])
else
- VLC_ADD_LDFLAGS([opengl],[-lopengl32])
+ VLC_ADD_LDFLAGS([opengl],[-lopengl32 -lglu32])
fi
])
else
if test "${enable_svg}" = "yes"
then
PKG_CHECK_MODULES(SVG,
- librsvg-2.0 >= 2.5.0,
+ librsvg-2.0 >= 2.9.0,
[
VLC_ADD_LDFLAGS([svg],[$SVG_LIBS])
VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS])
AC_CHECK_HEADERS(ddraw.h,
[ VLC_ADD_PLUGINS([vout_directx aout_directx])
VLC_ADD_LDFLAGS([vout_directx],[-lgdi32])
- dnl to be moved when dependance is removed
- AC_CHECK_HEADERS(GL/gl.h, [
- VLC_ADD_PLUGINS([glwin32])
- VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32])
- ]) ])
+ ])
+ AC_CHECK_HEADERS(GL/gl.h,
+ [ VLC_ADD_PLUGINS([glwin32])
+ VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32])
+ ])
+ AC_CHECK_HEADERS(d3d9.h,
+ [ VLC_ADD_PLUGINS([direct3d])
+ VLC_ADD_LDFLAGS([direct3d],[-ld3d9 -lgdi32])
+ ])
else
AC_MSG_CHECKING(for directX headers in ${with_directx})
if test -f ${with_directx}/ddraw.h
done
LIBS="${LIBS_save}"
dnl should not happen - otherwise this needs fixing - hence FAILURE
- AS_IF([test "${LIBS_cclink}" == "no"],
+ AS_IF([test "${LIBS_cclink}" = "no"],
[AC_MSG_FAILURE([cannot find XML parser for CyberLink])])
AC_MSG_RESULT([${LIBS_cclink}])
VLC_ADD_LDFLAGS([upnp_cc], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}])
VLC_ADD_CXXFLAGS([upnp_intel], [ ])
AS_IF([test "x${enable_upnp}" != "xno"], [
AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lpthread])
- AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" == "no"], [
+ AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"], [
AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)])
])
- AS_IF([test "${has_upnp}" == "yes"], [
+ AS_IF([test "${has_upnp}" = "yes"], [
VLC_ADD_LDFLAGS([upnp_intel], [-lupnp])
])
], [
has_upnp="no"
])
-AS_IF([test "${has_upnp}" == "yes"], [
+AS_IF([test "${has_upnp}" = "yes"], [
VLC_ADD_PLUGINS([upnp_intel])
])
fi
fi
+dnl
+dnl QT 4
+dnl
+enableqt4=false
+AC_ARG_ENABLE(qt4,
+ [ --enable-qt4 QT 4 support (default disabled) ],
+ [if test "${enable_qt4}" = "yes"; then
+ PKG_CHECK_MODULES(QT4, QtCore QtGui,
+ [ VLC_ADD_PLUGINS([qt4])
+ ALIASES="${ALIASES} qvlc"
+ enableqt4=true
+ VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
+ MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
+ RCC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/rcc
+ UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
+ [AC_MSG_WARN(QT4 library not found)])
+ fi])
+AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true")
+
dnl
dnl WinCE GUI module
dnl
[if test "${enable_macosx}" = "yes"
then
VLC_ADD_BUILTINS([macosx])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+ VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+ VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
VLC_ADD_BUILTINS([macosx])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+ VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+ VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
)])
CFLAGS=$ORIGCFLAGS
[ --enable-galaktos OpenGL visualisation plugin (default disabled)])
if test "${enable_galaktos}" = "yes"
then
- AC_CHECK_HEADERS(GL/gl.h, [
+ AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [
VLC_ADD_PLUGINS([galaktos])
if test "${SYS}" != "mingw32"; then
VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU])
[ --enable-gnutls gnutls TLS/SSL support (default enabled)])
AS_IF([test "${enable_gnutls}" != "no"], [
- gcrypt_LIBS="-lgpg-error"
- AS_IF([test "${SYS}" = "mingw32"], [
- gcrypt_LIBS="${gcrypt_LIBS} -lws2_32"
- VLC_ADD_LDFLAGS([gnutls],[-lws2_32])
- ])
-
- gnutls_LIBS="-lgcrypt -lz ${gcrypt_LIBS}"
-
- AC_CHECK_HEADER(gcrypt.h, [
- AC_CHECK_LIB(gcrypt, gcry_control, [
- AC_CHECK_HEADER(gnutls/gnutls.h, [
- AC_CHECK_LIB(gnutls, gnutls_certificate_verify_peers2,
- [have_gnutls="yes"],[old_gnutls="yes"],[${gnutls_LIBS}])
- ])
- ],,[${gcrypt_LIBS}])
- ])
+ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2.9], [have_gnutls="yes"], [have_gnutls="no"])
AS_IF([test "${have_gnutls}" = "yes"], [
VLC_ADD_PLUGINS([gnutls])
- VLC_ADD_LDFLAGS([gnutls], [-lgnutls ${gnutls_LIBS}])
+ VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
+ VLC_ADD_LDFLAGS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
- AC_MSG_ERROR([gnutls not present or too old (version 1.0.17 required)])
+ AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)])
])
])
])
activex=false
AC_ARG_ENABLE(activex,
[ --enable-activex build a vlc-based ActiveX control (default enabled on Win32)])
+AC_ARG_WITH(wine-sdk-path,
+ [ --with-wine-sdk-path=PATH path to wine sdk])
if test "${enable_activex}" != "no"
then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
then
- AC_CHECK_PROGS(MIDL, [midl widl], no)
+ AC_CHECK_PROGS(MIDL, [midl], no)
+ if test "${with_wine_sdk_path}" != ""
+ then
+ WINE_SDK_PATH=${with_wine_sdk_path}
+ AC_PATH_PROG(WIDL, widl, no, [$WINE_SDK_PATH/bin:$WINE_SDK_PATH/tools/widl])
+ else
+ AC_CHECK_PROGS(WIDL, [widl], no)
+ if test "${WIDL}" != "no"
+ then
+ WINE_SDK_PATH="`dirname ${WIDL}`"/..
+ fi
+ fi
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(ole2.h olectl.h,
[ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
fi
AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")
+AC_ARG_VAR(WIDL, [Wine IDL compiler (requires Wine SDK)])
+AM_CONDITIONAL(HAS_WIDL_COMPILER, test "${WIDL}" != "no")
AM_CONDITIONAL(BUILD_ACTIVEX,${activex})
dnl
if test "${enable_mozilla}" = "yes"
then
+ dnl currently vlc plugin only needs headers, no xpcom support apis are actually used
+ need_xpcom_libs=false
if test "${with_mozilla_sdk_path}" = ""
then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
if test "${MOZILLA_CONFIG}" = "no"
then
- AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
- else
- if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
- LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
- AC_CHECK_LIB(Xt,XtStrings,
- [
- VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
- VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
- ],
- [],
- [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
- ])
- LDFLAGS="${LDFLAGS_save}"
+ AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no)
+ if test "${SEAMONKEY_CONFIG}" = "no"
+ then
+ AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
+ if test "${XULRUNNER_CONFIG}" = "no"
+ then
+ AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
+ else
+ have_xul=true
+ MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+ fi
+ else
+ MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
fi
+ fi
+
+ if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
+ LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
+ AC_CHECK_LIB(Xt,XtStrings,
+ [
+ VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
+ VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
+],
+ [],
+ [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
+ ])
+ LDFLAGS="${LDFLAGS_save}"
+ fi
+
mozilla=:
dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
- VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
+ if ${need_xpcom_libs}; then
+ VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
+ else
+ VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`])
+ fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}"
AC_CHECK_HEADERS(mozilla-config.h)
CPPFLAGS="${CPPFLAGS_save}"
MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`"
XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \
`${MOZILLA_CONFIG} --idlflags plugin xpcom java` "
- xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
- fi
+ if ${have_xul}
+ then
+ xpidl_path="`${MOZILLA_CONFIG} --prefix`/lib/xulrunner"
+ else
+ xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
+ fi
+ dnl End of moz_sdk = ""
else
dnl special case for mingw32
if test "${SYS}" = "mingw32"
AC_CHECK_HEADERS(mozilla-config.h, [
mozilla=:
VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
- VLC_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
- if test "${SYS}" = "mingw32"; then
- LDFLAGS="${LDFLAGS_save}"
- dnl latest gecko sdk does not have embedstring
- if test -d "${real_mozilla_sdk}/embedstring/bin"
- then
- VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at])
- fi
+ if ${need_xpcom_libs}; then
+ VLC_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
+ if test "${SYS}" = "mingw32"; then
+ dnl latest gecko sdk does not have embedstring
+ if test -d "${real_mozilla_sdk}/embedstring/bin"
+ then
+ VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at])
+ fi
+ fi
fi
MOZILLA_SDK_PATH="${real_mozilla_sdk}"
CPPFLAGS="${CPPFLAGS_save}"
fi
- if test "${mozilla}" != "false"
+ if test "${enable_mozilla}" != "false"
then
- build_pic=yes
- AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla)
+ AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla:/usr/lib/xulrunner:/usr/lib64/xulrunner)
if test "${XPIDL}" = "no"; then
AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.])
fi
- fi
+ fi
fi
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
[ --enable-mediacontrol-python-bindings Enable Python bindings for MediaControl (default disabled)])
dnl TODO: look for python dev headers
AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_mediacontrol_python_bindings}" = "yes"])
-if test "${enable_mediacontrol_python_bindings}" = "yes"
-then
- build_pic=yes
-fi
dnl
dnl Java bindings
dnl
AC_ARG_ENABLE(java-bindings,
[ --enable-java-bindings Enable Java bindings (default disabled)])
-AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
if test "${enable_java_bindings}" = "yes"
then
- build_pic=yes
+ AS_IF([test "x${JAVA_HOME}" == "x"],
+ [AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])])
+ AC_PROG_JAVAC
+ AC_PROG_JAVA
fi
-
+AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
dnl
dnl test plugins
AM_CONDITIONAL(BUILD_SHARED, [test "${enable_shared_libvlc}" != "no"])
AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no"], [
AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
- FILE_LIBVLC_DLL="!insertmacro InstallFile libvlc.dll"],
+ FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"],
FILE_LIBVLC_DLL="" )
-pic=no
-AS_IF([test "${build_pic}" = "yes"], [pic=pic])
-AS_IF([test "${SYS}" = "mingw32"], [pic=no])
-AS_IF([test "${pic}" = "no"], [pic=])
-AC_SUBST(pic)
-
-AM_CONDITIONAL(BUILD_PIC, [test "${build_pic}" = "yes" && test "x${pic}" = "xpic"])
-
dnl Import conditional variables generated by bootstrap
VLC_CONDITIONALS
dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
-dnl New definitions with value matching 0.8.4 release
-module_symbol="0_8_4"
+dnl New definitions with value matching 0.8.6 release
+module_symbol="0_8_6b"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
VLC_ENTRY="vlc_entry__${module_symbol}"
AC_SUBST(ALIASES)
AC_SUBST(ASM)
AC_SUBST(MOC)
+AC_SUBST(RCC)
+AC_SUBST(UIC)
AC_SUBST(WINDRES)
AC_SUBST(MOZILLA_SDK_PATH)
+AC_SUBST(WINE_SDK_PATH)
AC_SUBST(XPIDL)
AC_SUBST(XPIDL_INCL)
AC_SUBST(LIBEXT)
-AC_SUBST(INCLUDES)
+AC_SUBST(AM_CPPFLAGS)
AC_SUBST(ALL_LINGUAS)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
AC_SUBST(FILE_LIBVLC_DLL)
activex/axvlc.inf
bindings/Makefile
bindings/java/Makefile
+ bindings/java/src/Makefile
bindings/mediacontrol-python/Makefile
- debian/Makefile
doc/Makefile
intl/Makefile
ipkg/Makefile
modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/access/mms/Makefile
- modules/access/pvr/Makefile
- modules/access/v4l/Makefile
modules/access/cdda/Makefile
modules/access/rtsp/Makefile
modules/access/vcd/Makefile
modules/gui/pda/Makefile
modules/gui/macosx/Makefile
modules/gui/qnx/Makefile
+ modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/gui/wxwidgets/Makefile
modules/gui/wince/Makefile
modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile
modules/misc/xml/Makefile
+ modules/misc/probe/Makefile
modules/mux/Makefile
modules/mux/mpeg/Makefile
modules/mux/rtp/Makefile