X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=4c95aa42b10720ec30c40553fc9c3b60eeca05fb;hb=8e7484b4ff79cc0d22ee0a61ee372dee78431eed;hp=781a00a325806ed2570f7d081091b5f9a5ef8963;hpb=be9b749c89b70151c997396c4e89dc3dfbad8232;p=vlc diff --git a/configure.ac b/configure.ac index 781a00a325..4c95aa42b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,9 @@ dnl Autoconf settings for vlc -dnl $Id$ -AC_INIT(vlc,0.8.5-svn) +AC_INIT(vlc,0.8.6-svn) VERSION_MAJOR="0" VERSION_MINOR="8" -VERSION_REVISION="5" +VERSION_REVISION="6" VERSION_EXTRA="svn" CONFIGURE_LINE="$0 $*" @@ -17,7 +16,7 @@ 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.5-svn) +AM_INIT_AUTOMAKE(vlc,0.8.6-svn) AM_CONFIG_HEADER(config.h) dnl Too many people are not aware of maintainer mode: @@ -74,9 +73,15 @@ AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(LD, ld, :) -dnl Sam, if you think I didn't see that... --Meuuh -dnl AM_PROG_LIBTOOL -AC_PROG_INSTALL +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 @@ -88,13 +93,22 @@ dnl 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 |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" @@ -104,15 +118,11 @@ AC_ARG_WITH(contrib, 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 fi - if test -d ${topdir}/extras/contrib/vlc-lib; then - LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/vlc-lib" - LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/vlc-lib" - fi LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib" LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib" @@ -120,12 +130,18 @@ dnl kludge because only the debian package provides a ffmpeg-config 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 fi + if test -z $with_mozilla_sdk_path; then + with_mozilla_sdk_path=${topdir}/extras/contrib/gecko-sdk + fi + if test -z $with_cyberlink_tree; then + with_cyberlink_tree=${topdir}/extras/contrib/src/clinkcc + fi if test ".`uname -s`" = ".Darwin"; then export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH @@ -134,6 +150,9 @@ dnl kludge because only the debian package provides a ffmpeg-config 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 @@ -243,9 +262,11 @@ case "${target_os}" in CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}" VLC_ADD_CXXFLAGS([beos],[]) - VLC_ADD_LDFLAGS([vlc beos logger],[-lbe]) - VLC_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame]) - + 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]) @@ -284,16 +305,22 @@ fi 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 "${enable_libtool}" != "no"], [ + INCLUDED_LIBINTL="${LTLIBINTL}" + ],[ + INCLUDED_LIBINTL="${LIBINTL}" + ]) else VLC_ADD_LDFLAGS([vlc],[${LIBINTL}]) + INCLUDED_LIBINTL= fi -AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes") +AC_SUBST(INCLUDED_LIBINTL) XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS" dnl @@ -304,7 +331,11 @@ AS_IF([test "$am_cv_func_iconv" != "yes"], [AC_MSG_ERROR([libiconv is needed for VLC to work properly])]) fi VLC_ADD_CFLAGS([vlc],[${INCICONV}]) -VLC_ADD_LDFLAGS([vlc],[${LIBICONV}]) +AS_IF([test "${enable_libtool}" != "no"], [ + VLC_ADD_LDFLAGS([vlc],[${LIBICONV}]) +],[ + VLC_ADD_LDFLAGS([vlc],[${LTLIBICONV}]) +]) dnl Check for the need to include the mingwex lib for mingw32 if test "${SYS}" = "mingw32" @@ -363,6 +394,7 @@ VLC_LIBRARY_SUFFIX VLC_SYMBOL_PREFIX AC_SUBST(SYMPREF) +AS_IF([test "${enable_libtool}" = "no"], [ case "${SYS}" in mingw32|cygwin) VLC_ADD_CFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}]) @@ -378,6 +410,7 @@ case "${SYS}" in VLC_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC]) ;; esac +]) dnl The -DSYS_FOO flag CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CPPFLAGS="${CPPFLAGS_save}" @@ -385,7 +418,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd dnl Check for system libs needed need_libc=false -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat) +AC_CHECK_FUNCS(gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy) dnl Check for usual libc functions AC_CHECK_FUNCS(strdup strndup atof) @@ -411,7 +444,8 @@ fi AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LDFLAGS([vlc ipv4 cdda cddax],-lsocket) + VLC_ADD_LDFLAGS([vlc ipv4 ipv6 cdda cddax],-lsocket) + LIBS_socket="-lsocket" ]) ]) @@ -423,7 +457,7 @@ AC_CHECK_FUNCS(send,,[ AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname,[ - VLC_ADD_LDFLAGS([cdda cddax ipv4 vlc],[-lnsl]) + VLC_ADD_LDFLAGS([cdda cddax ipv4 ipv6 vlc],[-lnsl]) ],[ AC_CHECK_LIB(bind,gethostbyname,[ VLC_ADD_LDFLAGS([ipv4 access_mms],[-lbind]) @@ -458,16 +492,25 @@ AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage, #endif], [struct sockaddr_storage addr;], ac_cv_struct_sockaddr_storage=yes, ac_cv_struct_sockaddr_storage=no)]) -if test $ac_cv_struct_sockaddr_storage = no; then +AS_IF([test "${ac_cv_struct_sockaddr_storage}" = no], [ AC_DEFINE(sockaddr_storage, sockaddr) AC_DEFINE(ss_family, sa_family) -fi +]) dnl getaddrinfo, getnameinfo and gai_strerror check -dnl -lresolv is NOT needed on Solaris +dnl -lnsl and -lsocket are needed on Solaris; dnl we purposedly make the test fail on Windows -AC_CHECK_FUNCS([getaddrinfo getnameinfo gai_strerror]) -AH_TEMPLATE(HAVE_ADDRINFO, [Define to `1' if defines struct addrinfo.]) +LIBS_save="${LIBS}" +AH_TEMPLATE(HAVE_GETADDRINFO, [Define to 1 if you have the `getaddrinfo' function.]) +AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${LIBS_socket}]) + +dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro +dnl are +LIBS="${LIBS_gai}" +AC_CHECK_FUNCS([getnameinfo gai_strerror]) +LIBS="${LIBS_save}" + +AH_TEMPLATE(HAVE_ADDRINFO, [Define to 1 if defines `struct addrinfo'.]) AC_CHECK_TYPES([struct addrinfo],[AC_DEFINE(HAVE_ADDRINFO)],, [#include #if defined( WIN32 ) || defined( UNDER_CE ) @@ -526,11 +569,14 @@ AC_CHECK_LIB(m,cos,[ VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264 goom],[-lm]) ]) AC_CHECK_LIB(m,pow,[ - VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq vlc freetype mpc],[-lm]) + 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]) ]) @@ -674,8 +720,13 @@ VLC_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}]) 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_gettime, [ + VLC_ADD_LDFLAGS([vlc],[-lrt]) + AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have clock_gettime.]) + ], [ + dnl HP/UX port + AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])]) + ]) have_nanosleep=false AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ @@ -769,7 +820,7 @@ dnl Check for hal 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]) @@ -788,6 +839,27 @@ then ) fi +dnl Check for dbus +AC_ARG_ENABLE(dbus, + [ --enable-dbus Linux D-BUS message bus system (default enabled)]) + +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]) + AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) + VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], + dnl older dbus + [ PKG_CHECK_MODULES( DBUS, dbus-1, + [AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library]) + VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], + [AC_MSG_WARN(DBUS library not found)]) + ] + ) +fi + dnl Build the gtk_main plugins? NEED_GTK_MAIN=no NEED_GNOME_MAIN=no @@ -943,10 +1015,10 @@ AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic], [ac_cv_c_dynamic_no_pic], [CFLAGS="${CFLAGS_save} -mdynamic-no-pic" AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)]) -if test "${ac_cv_c_dynamic_no_pic}" != "no"; then +AS_IF([test "${enable_libtool}" = "no" && test "${ac_cv_c_dynamic_no_pic}" != "no"], [ VLC_ADD_CFLAGS([builtin],[-mdynamic-no-pic]) VLC_ADD_CFLAGS([libvlc],[-mdynamic-no-pic]) -fi +]) dnl Check for Darwin plugin linking flags AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error], @@ -1056,7 +1128,7 @@ VLC_ADD_PLUGINS([deinterlace invert adjust transform distort motionblur rv32]) VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32]) 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]) @@ -1175,7 +1247,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) -if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "solaris"; then +if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"; then AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.) ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" fi @@ -1357,7 +1429,7 @@ AC_ARG_ENABLE(debug, 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 @@ -1371,8 +1443,10 @@ dnl Is the shared libvlc forced ? dnl build_pic=no AC_ARG_ENABLE(shared-libvlc, - [ --enable-shared-libvlc shared libvlc (default disabled EXPERIMENTAL)]) - + [ --enable-shared-libvlc Win32 libvlc.dll build (default disabled)]) +AS_IF([test "${enable_libtool}" != "no" && test "${enable_shared_libvlc}"], [ + AC_MSG_ERROR([--enable-shared-libvlc and --enable-libtool are mutually exclusive]) +]) dnl dnl Stream output @@ -1429,119 +1503,107 @@ dnl dnl Growl notification plugin dnl AC_ARG_ENABLE(growl, - [ --enable-growl growl notification plugin (default enabled)]) + [ --enable-growl growl notification plugin (default enabled)]) AS_IF([test "${enable_growl}" != "no"], [ VLC_ADD_PLUGINS([growl]) ] ) -dnl -dnl TLS/SSL -dnl -AC_ARG_ENABLE(gnutls, - [ --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})]) - - AS_IF([test "${have_gnutls}" = "yes"], [ - VLC_ADD_PLUGINS([gnutls]) - VLC_ADD_LDFLAGS([gnutls], [-lgnutls ${gnutls_LIBS}]) - ], [ - AS_IF([test "${enable_gnutls}" = "yes"], [ - AC_MSG_ERROR([gnutls not present or too old (version 1.0.17 required)])] - )] - )] -) - - dnl dnl Input plugins dnl 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="${CPPFLAGS} ${CPPFLAGS_livedotcom}" + CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment" + if test "${SYS}" = "solaris"; then + CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" + fi + 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_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_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([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([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 @@ -1931,7 +1993,7 @@ dnl gnomeVFS access module 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]) @@ -2157,9 +2219,7 @@ dnl ipv6 plugin - not for QNX yet dnl have_ipv6=no AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[ - AC_CHECK_LIB(resolv,inet_pton, - [have_ipv6=yes - VLC_ADD_LDFLAGS([ipv6 vlc],[-lresolv])]) + AC_CHECK_LIB(nsl,inet_pton, [have_ipv6=yes]) ]) AS_IF([test "${have_ipv6}" = "yes"], [ @@ -2334,6 +2394,43 @@ then VLC_ADD_LDFLAGS([mpc],[-lmpcdec])]) fi +dnl +dnl game music emu demux plugin +dnl +AC_ARG_ENABLE(gme, + [ --enable-gme Game Music Emu demux support (default enabled)]) +if test "${enable_gme}" != "no" -a "${CXX}" != ""; +then + AC_LANG_PUSH(C++) + AC_ARG_WITH(gme-tree, + [ --with-gme-tree=PATH gme tree for static linking]) + if test -n "${with_gme_tree}" + then + AC_MSG_CHECKING(for libgme.a in ${with_mod_tree}) + real_gme_tree="`cd ${with_gme_tree} 2>/dev/null && pwd`" + if test -z "${real_gme_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_gme_tree}]) + fi + if test -f "${real_gme_tree}/gme/libgme.a" + then + dnl Use a custom gme + AC_MSG_RESULT(${real_gme_tree}/gme/libgme.a) + VLC_ADD_PLUGINS([gme]) + VLC_ADD_LDFLAGS([gme],[${real_gme_tree}/gme/libgme.a]) + VLC_ADD_CXXFLAGS([gme],[-I${real_gme_tree}/gme]) + else + dnl The given gme wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_mod_tree}/gme/libgme.a, make sure you compiled gme in ${with_gme_tree}]) + fi + else + AC_MSG_WARN([only static linking is available, you must provide a gme-tree]) + fi + AC_LANG_POP(C++) +fi dnl dnl Codec plugins @@ -2552,7 +2649,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec]) if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then - AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.]) + AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat]) fi @@ -2571,6 +2668,8 @@ dnl Look for a ffmpeg-config (we are on debian ) if test "${FFMPEG_CONFIG}" != "no" then AC_CHECK_HEADERS(ffmpeg/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(postproc/postprocess.h) VLC_ADD_PLUGINS([ffmpeg]) if test "${enable_sout}" != "no"; then @@ -2585,6 +2684,8 @@ dnl Trying with pkg-config PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], [ AC_CHECK_HEADERS(ffmpeg/avcodec.h) + 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 @@ -2604,6 +2705,8 @@ dnl Trying with pkg-config CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) + AC_CHECK_HEADERS(ffmpeg/avformat.h) + 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, [ @@ -2620,9 +2723,9 @@ dnl Trying with pkg-config 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_CHECK_LIB(avformat, av_open_input_stream, [ - AC_DEFINE(HAVE_LIBAVFORMAT, 1, - [Define if you have ffmpeg's libavformat.]) VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" @@ -2664,7 +2767,7 @@ then VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then - AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.]) + AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavformat -lavformataltivec -lz]) VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavformat]) fi @@ -2806,7 +2909,7 @@ dnl dnl MP4 module dnl AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LDFLAGS([mp4 skins2 sap mkv],[-lz]) + VLC_ADD_LDFLAGS([mp4 skins2 sap mkv gme],[-lz]) ] ) AC_CHECK_HEADERS(sysfs/libsysfs.h, [ @@ -2901,7 +3004,7 @@ dnl dnl DTS Coherent Acoustics decoder plugin dnl AC_ARG_ENABLE(dts, - [ --enable-dts DTS Coherent Acoustics support with libdts (default enabled)]) + [ --enable-dts DTS Coherent Acoustics support with libdca (default enabled)]) if test "${enable_dts}" != "no"; then AC_ARG_WITH(dts-tree, [ --with-dts-tree=PATH libdts tree for static linking ],[],[]) @@ -3218,33 +3321,6 @@ if test "${enable_dirac}" = "yes"; then ]) fi -dnl libvc1 decoder plugin -dnl -AC_ARG_ENABLE(libvc1, -[ --enable-libvc1 VC-1 codec (default disabled)]) -if test "${enable_libvc1}" = "yes" -then - AC_ARG_WITH(libvc1-tree, - [ --with-libvc1-tree=PATH libvc1 tree for static linking]) - if test -n "${with_libvc1_tree}" - then - AC_MSG_CHECKING(for vc1dec.o in ${with_libvc1_tree}) - real_libvc1_tree="`cd ${with_libvc1_tree} 2>/dev/null && pwd`" - if test -f "${real_libvc1_tree}/src/.libs/vc1dec.o" - then - VLC_ADD_BUILTINS([libvc1]) - VLC_ADD_CPPFLAGS([libvc1],[-I${real_libvc1_tree}/src]) - VLC_ADD_LDFLAGS([libvc1],[${real_libvc1_tree}/src/.libs/libvc1.a]) - AC_MSG_RESULT(yes) - else - dnl The given libvc1 tree wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_libvc1_tree}/src/.libs/vc1dec.o, - make sure you compiled libvc1 in ${with_libvc1_tree}]) - fi - fi -fi - dnl dnl PNG decoder module dnl @@ -3383,7 +3459,7 @@ if test "${enable_xvideo}" != "no" && AC_CHECK_LIB(Xv,XvPutImage,[ # If libXv.so is available, xvideo can be a plugin. Otherwise, we # test for libXv_pic. - if test -f /usr/X11R6/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then + if test -f /usr/X11R6/lib/libXv.so -o -f /usr/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then VLC_ADD_PLUGINS([xvideo]) VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) @@ -3414,21 +3490,22 @@ if test "${enable_glx}" != "no" && (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_xvideo}" != "no" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_xvideo}" = "yes"); then dnl dnl Check for the Xinerama extension dnl +AC_ARG_ENABLE(xinerama, + [ --enable-xinerama Xinerama support (default enabled)]) +if test "${enable_xvideo}" != "no" && test "${enable_xinerama}" != "no" && + (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || + test "${enable_xvideo}" = "yes"); then ac_cv_have_xinerama="no" CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" @@ -4155,7 +4232,7 @@ dnl CyberLink for C++ UPnP stack dnl AC_ARG_ENABLE(cyberlink, [ --enable-cyberlink CyberLink for C++ UPnP stack (default disabled)]) -AS_IF([test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_cyberlink}" != "no")], [ + AS_IF([test "${enable_cyberlink}" = "yes" ], [ AC_ARG_WITH(cyberlink-tree, [ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking]) @@ -4209,7 +4286,7 @@ class testclass : public SearchResponseListener, public MediaPlayer 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}]) @@ -4231,17 +4308,17 @@ AC_ARG_ENABLE(upnp, 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]) ]) @@ -4650,6 +4727,8 @@ AC_ARG_ENABLE(opie, dnl dnl MacOS X module dnl +ORIGCFLAGS=$CFLAGS +CFLAGS="$CFLAGS -x objective-c" AC_ARG_ENABLE(macosx, [ --enable-macosx MacOS X support (default enabled on MacOS X)], [if test "${enable_macosx}" = "yes" @@ -4661,6 +4740,7 @@ AC_ARG_ENABLE(macosx, VLC_ADD_BUILTINS([macosx]) VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) )]) +CFLAGS=$ORIGCFLAGS dnl dnl QNX RTOS module @@ -4724,7 +4804,7 @@ AC_ARG_ENABLE(galaktos, [ --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]) @@ -4862,6 +4942,41 @@ AM_CONDITIONAL(ENABLE_CORBA, test "$enablecorba" = "true") AC_ARG_WITH(,[Misc options:]) +dnl +dnl TLS/SSL +dnl +AC_ARG_ENABLE(gnutls, + [ --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}]) + ]) + + AS_IF([test "${have_gnutls}" = "yes"], [ + VLC_ADD_PLUGINS([gnutls]) + VLC_ADD_LDFLAGS([gnutls], [-lgnutls ${gnutls_LIBS}]) + ], [ + AS_IF([test "${enable_gnutls}" = "yes"], [ + AC_MSG_ERROR([gnutls not present or too old (version 1.0.17 required)]) + ]) + ]) +]) + + dnl dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling dnl @@ -4931,11 +5046,11 @@ AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AS_IF([test "${enable_loader}" = "yes"], [ VLC_ADD_PLUGINS([dmo quicktime]) VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/loader]) - VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.a]) + VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.la]) VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/loader]) - VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.a]) + VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.la]) VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/loader -DLOADER]) - VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.a]) + VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.la]) ]) dnl @@ -4981,17 +5096,29 @@ AC_ARG_WITH(mozilla-sdk-path, 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 test "${SYS}" != "mingw32"; 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 + + 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_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])], + [ + 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] ]) @@ -5000,14 +5127,25 @@ then 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" + if ${have_xul} + then + xpidl_path="`${MOZILLA_CONFIG} --prefix`/lib/xulrunner" + else + xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin" + fi fi + dnl End of moz_sdk = "" else dnl special case for mingw32 if test "${SYS}" = "mingw32" @@ -5024,16 +5162,18 @@ then 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}" XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl" xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin" @@ -5047,11 +5187,11 @@ then if test "${mozilla}" != "false" then build_pic=yes - AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path} /usr/lib/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}) @@ -5098,6 +5238,16 @@ then #VLC_ADD_BUILTINS([${TESTS}]) fi +dnl +dnl Microsoft Layer for Unicode for WIN9x/ME +dnl +if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" +then + AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [ + VLC_ADD_LDFLAGS([vlc],[-Wl,--exclude-libs,libunicows.a -lunicows]) + ]) +fi + dnl dnl gtk_main plugin dnl @@ -5194,19 +5344,21 @@ AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) dnl dnl Pic and shared libvlc stuff dnl -AS_IF([test "x${shared_libvlc}" = "x"], [shared_libvlc=no]) -AM_CONDITIONAL(BUILD_SHARED, [test "${shared_libvlc}" != "no"]) -AM_CONDITIONAL(BUILD_PIC, [test "${build_pic}" = "yes" -o "${shared_libvlc}" != "no"] ) -AS_IF([test "${shared_libvlc}" != "no"], [ +AS_IF([test "x${enable_shared_libvlc}" = "x"], [enable_shared_libvlc=no]) +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="!define LIBVLC_DLL libvlc.dll"], + FILE_LIBVLC_DLL="" ) pic=no -AS_IF([test "${shared_libvlc}" != "no" -o "${build_pic}" = "yes"], [pic=pic]) +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 @@ -5233,8 +5385,8 @@ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" 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.5 release +module_symbol="0_8_5" 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}" @@ -5267,12 +5419,14 @@ AC_SUBST(ALIASES) AC_SUBST(ASM) AC_SUBST(MOC) AC_SUBST(WINDRES) +AC_SUBST(MOZILLA_SDK_PATH) AC_SUBST(XPIDL) AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) AC_SUBST(INCLUDES) AC_SUBST(ALL_LINGUAS) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) +AC_SUBST(FILE_LIBVLC_DLL) dnl Import substitutions generated by bootstrap VLC_SUBSTS @@ -5281,17 +5435,16 @@ dnl Create vlc-config.in VLC_OUTPUT_VLC_CONFIG_IN AC_CONFIG_FILES([ + vlc.win32.nsi Makefile activex/Makefile activex/axvlc.inf bindings/Makefile bindings/java/Makefile bindings/mediacontrol-python/Makefile - debian/Makefile doc/Makefile intl/Makefile ipkg/Makefile - lib/Makefile loader/Makefile modules/Makefile mozilla/Makefile @@ -5353,6 +5506,7 @@ AC_CONFIG_FILES([ modules/misc/xml/Makefile modules/mux/Makefile modules/mux/mpeg/Makefile + modules/mux/rtp/Makefile modules/packetizer/Makefile modules/services_discovery/Makefile modules/stream_out/Makefile @@ -5386,7 +5540,9 @@ dnl for a in `./vlc-config --target plugin` ; do echo $a; done | sed -e 's,modul dnl Shortcut to nice compile message rm -f compile echo '#! /bin/sh' >compile -echo "PATH=$PATH LANG=C make \$* 2>&1| ${srcdir}/extras/make.pl" >>compile + +echo "PATH=$PATH LANG=C make \$* 2>&1| \\" >> compile +echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile chmod a+x compile printf "