X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=5ee5be236e3703d1c5aff61598fbaa2c95ce5236;hb=1a2878255a326bfaf90bea5badfe1a9f684338b3;hp=b430894f62fa060419595b5bd8d12829e0b9b823;hpb=c397800da5b5b019e367f40f3fc4d8b1505685ea;p=vlc diff --git a/configure.ac b/configure.ac index b430894f62..5ee5be236e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl Autoconf settings for vlc -AC_INIT(vlc,0.8.5-test2) +AC_INIT(vlc,0.8.6-svn) VERSION_MAJOR="0" VERSION_MINOR="8" -VERSION_REVISION="5" -VERSION_EXTRA="test2" +VERSION_REVISION="6" +VERSION_EXTRA="svn" CONFIGURE_LINE="$0 $*" CODENAME="Janus" @@ -16,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-test2) +AM_INIT_AUTOMAKE(vlc,0.8.6-svn) AM_CONFIG_HEADER(config.h) dnl Too many people are not aware of maintainer mode: @@ -93,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" @@ -109,7 +118,7 @@ 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 @@ -121,8 +130,8 @@ 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 @@ -141,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 @@ -291,7 +303,7 @@ 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 @@ -404,7 +416,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) @@ -560,6 +572,9 @@ AC_CHECK_LIB(m,pow,[ 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]) ]) @@ -798,7 +813,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]) @@ -817,6 +832,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 @@ -1085,7 +1121,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]) @@ -1386,7 +1422,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 @@ -1460,7 +1496,7 @@ 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]) ] @@ -1473,79 +1509,94 @@ 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}" +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_livedotcom}" = "yes"; then - AC_ARG_WITH(livedotcom-tree, - [ --with-livedotcom-tree=PATH live.com tree for static linking]) + 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_live55_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 @@ -1935,7 +1986,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]) @@ -2336,6 +2387,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 @@ -2814,7 +2902,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, [ @@ -2909,7 +2997,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 ],[],[]) @@ -3226,33 +3314,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 @@ -4219,7 +4280,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}]) @@ -4241,17 +4302,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]) ]) @@ -5029,17 +5090,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] ]) @@ -5048,15 +5121,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" @@ -5073,14 +5156,15 @@ 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}" @@ -5097,11 +5181,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}) @@ -5154,7 +5238,7 @@ dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [ - VLC_ADD_LDFLAGS([vlc],[-lunicows]) + VLC_ADD_LDFLAGS([vlc],[-Wl,--exclude-libs,libunicows.a -lunicows]) ]) fi @@ -5258,7 +5342,7 @@ 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="File libvlc.dll"], + FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"], FILE_LIBVLC_DLL="" ) pic=no @@ -5295,8 +5379,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}" @@ -5352,7 +5436,6 @@ AC_CONFIG_FILES([ bindings/Makefile bindings/java/Makefile bindings/mediacontrol-python/Makefile - debian/Makefile doc/Makefile intl/Makefile ipkg/Makefile