X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=92131071653846d76a8f26adef32e4e357b33c00;hb=875cd3dde62952d9fd9f3ec684a87fd5ea0732c6;hp=6ea583a737a9250d1278e7c36fc9ab133948d5b2;hpb=91a4847521643cd0fb8ce26f7ed022b5e2f56f81;p=vlc diff --git a/configure.ac b/configure.ac index 6ea583a737..9213107165 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_INIT(vlc, 0.9.0-test2) +AC_INIT(vlc, 0.9.0-test3) VERSION_MAJOR="0" VERSION_MINOR="9" VERSION_REVISION="0" @@ -57,7 +57,7 @@ dnl Check for tools dnl AC_PROG_CC_C99 AC_USE_SYSTEM_EXTENSIONS -AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to `2' to get glibc warnings.]) +AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to '2' to get glibc warnings.]) AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_CPP @@ -80,6 +80,17 @@ AC_C_CONST AC_C_INLINE AC_C_RESTRICT +dnl Allow binary package maintainer to pass a custom string to avoid +dnl cache problem +AC_ARG_WITH(binary-version, + AS_HELP_STRING([--with-binary-version=STRING], + [To avoid plugins cache problem between binary version]),[],[]) +AS_IF([test -n "${with_binary_version}"],[ + AC_DEFINE_UNQUOTED([DISTRO_VERSION],["${with_binary_version}"], + [Binary specific version]) + ]) + + dnl dnl Check for the contrib directory dnl @@ -119,24 +130,12 @@ AC_ARG_WITH(contrib, LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib" LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib" - 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 -z $with_libmpeg2_tree; then - with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec - fi - if test -z $with_a52_tree; then - with_a52_tree=${topdir}/extras/contrib/src/a52dec - fi if test ".`uname -s`" = ".Darwin"; then export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH @@ -197,7 +196,8 @@ case "${host_os}" in VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation]) AC_ARG_ENABLE(macosx-defaults, - [ --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)]) + AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration + on Mac OS X (default enabled)])) if test "x${enable_macosx_defaults}" != "xno" then echo "" @@ -419,8 +419,6 @@ dnl dnl Iconv stuff dnl AM_ICONV -AS_IF([test "$am_cv_func_iconv" != "yes"], - [AC_MSG_ERROR([libiconv is needed for VLC to work properly])]) VLC_ADD_CFLAGS([libvlc],[${INCICONV}]) VLC_ADD_LIBS([libvlc],[${LTLIBICONV}]) @@ -792,7 +790,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ dnl Check for headers AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h) -AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h) +AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h) AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ @@ -853,7 +851,9 @@ dnl Find where are the X headers and libraries AC_PATH_XTRA() dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal. - +dnl Make PKG_CONFIG_PATH precious so that it appears in the help and get saved +AC_ARG_VAR(PKG_CONFIG_PATH, + [Paths where to find .pc not at the default location]) PKG_PROG_PKG_CONFIG() dnl Check for hal @@ -894,7 +894,8 @@ then VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) fi dnl Check for Telepathy - AC_ARG_ENABLE(telepathy, [ --enable-telepathy Telepathy Presence plugin through DBus(default enabled)]) + AC_ARG_ENABLE(telepathy, + AS_HELP_STRING([--enable-telepathy],[Telepathy Presence plugin through DBus(default enabled)])) if test "${enable_telepathy}" != "no"; then VLC_ADD_PLUGIN([telepathy]) VLC_ADD_LIBS([telepathy],[$DBUS_LIBS]) @@ -1620,7 +1621,8 @@ fi dnl Lua modules AC_ARG_ENABLE(lua, - [ --enable-lua lua playlist, metafetcher and interface plugins (default enabled)]) + AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface + plugins (default enabled)])) if test "${enable_lua}" != "no" then PKG_CHECK_MODULES(LUA, lua5.1, @@ -1780,11 +1782,11 @@ 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}" = "no" then enable_live555="no" fi + AC_ARG_ENABLE(live555, [ --enable-live555 live555 RTSP input plugin (default enabled)]) if test "${enable_live555}" != "no"; then @@ -1808,23 +1810,34 @@ if test "${enable_live555}" != "no"; then CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" fi CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" + + AC_CHECK_HEADERS(liveMedia_version.hh, [ + AC_MSG_CHECKING(for liveMedia version >= 1214895600 ) + AC_EGREP_CPP(yes, + [#include + #ifdef LIVEMEDIA_LIBRARY_VERSION_INT + #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600 + yes + #endif + #endif], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. +lternatively you can use --disable-live555 to disable the liveMedia plugin.]) + ],[ + AC_MSG_RESULT([yes]) + ]) + ]) + other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" + if test "${SYS}" = "mingw32"; then + # add ws2_32 for closesocket, select, recv + other_libs="$other_libs -lws2_32" + fi AC_CHECK_HEADERS(liveMedia.hh, [ VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}]) - AC_CHECK_LIB(liveMedia_pic, main, [ - # We have -lliveMedia_pic, build plugins - VLC_ADD_PLUGIN([live555]) - VLC_ADD_LIBS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic]) - ], [ AC_CHECK_LIB(liveMedia, main, [ - # We only have -lliveMedia, do builtins VLC_ADD_PLUGIN([live555]) - VLC_ADD_LIBS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) - ]) - ]) - if test "${SYS}" = "mingw32"; then - # add ws2_32 for closesocket, select, recv - VLC_ADD_LIBS([live555],[-lws2_32]) - fi + VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}]) + ],[],[${other_libs}]) ]) CPPFLAGS="${CPPFLAGS_save}" AC_LANG_POP(C++) @@ -1839,6 +1852,23 @@ if test "${enable_live555}" != "no"; then if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a) + AC_CHECK_HEADERS(${real_live555_tree}/liveMedia/include/liveMedia_version.hh,[ + AC_MSG_CHECKING(for liveMedia version >= 1214895600 ) + AC_EGREP_CPP(yes, + [#include "${real_live555_tree}/liveMedia/include/liveMedia_version.hh" + #ifdef LIVEMEDIA_LIBRARY_VERSION_INT + #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600 + yes + #endif + #endif], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. +lternatively you can use --disable-live555 to disable the liveMedia plugin.]) + ],[ + AC_MSG_RESULT([yes]) + ]) + ]) + VLC_ADD_PLUGIN([live555]) if test "${SYS}" = "mingw32"; then @@ -1953,7 +1983,7 @@ then then dnl Use a custom libraw1394 AC_MSG_RESULT(${real_dv_raw1394_tree}/src/.libs/libraw1394.a) - VLC_ADD_BUILTINS([access_dv]) + VLC_ADD_PLUGIN([access_dv]) VLC_ADD_LIBS([access_dv],[-L${real_dv_raw1394_tree}/src/.libs -lraw1394]) VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_raw1394_tree}]) else @@ -2070,7 +2100,7 @@ then then dnl Use a custom libdvdread AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) - VLC_ADD_BUILTINS([dvdread]) + VLC_ADD_PLUGIN([dvdread]) VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LIBS_dvdcss}]) VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) else @@ -2146,7 +2176,8 @@ dnl dnl Windows DirectShow BDA access module dnl AC_ARG_ENABLE(bda, - [ --enable-bda Win32 DirectShow BDA support (default enabled on Win32)]) + AS_HELP_STRING([--enable-bda],[Win32 DirectShow BDA support (default + enabled on Win32)])) if test "${enable_bda}" != "no" then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" @@ -2265,9 +2296,9 @@ then then dnl Use a custom libdvbpsi AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) - VLC_ADD_BUILTINS([ts]) + VLC_ADD_PLUGIN([ts]) if test "${enable_sout}" != "no"; then - VLC_ADD_BUILTINS([mux_ts]) + VLC_ADD_PLUGIN([mux_ts]) fi VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src]) VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a]) @@ -2446,7 +2477,8 @@ dnl dnl VCDX and CDDAX modules dnl AC_ARG_ENABLE(cddax, - [ --enable-cddax audio CD plugin with CD Text and CD paranoia via libcdio (default disabled)]) + AS_HELP_STRING([--enable-cddax],[audio CD plugin with CD Text and CD paranoia + via libcdio (default disabled)])) AC_ARG_ENABLE(libcddb, [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)]) @@ -2595,12 +2627,7 @@ then fi CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include" AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [ - if test -z "${with_dvbpsi_tree}" - then - VLC_ADD_PLUGIN([dvb]) - else - VLC_ADD_BUILTINS([dvb]) - fi + VLC_ADD_PLUGIN([dvb]) ],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -2884,7 +2911,7 @@ then VLC_ADD_LIBS([mpgatofixed32],[-L${real_mad_tree}/.libs]) LDFLAGS="${LDFLAGS_save} ${LIBS_mpgatofixed32}" AC_CHECK_LIB(mad, mad_bit_init, [ - VLC_ADD_BUILTINS([mpgatofixed32]) + VLC_ADD_PLUGIN([mpgatofixed32]) VLC_ADD_LIBS([mpgatofixed32],[-lmad]) ],[ AC_MSG_ERROR([the specified tree hasn't been compiled ]) ],[]) @@ -2974,7 +3001,8 @@ dnl swscale image scaling and conversion plugin dnl AC_ARG_ENABLE(swscale, -[ --enable-swscale libswscale image scaling and conversion (default enabled)]) + AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion + (default enabled)])) if test "${enable_swscale}" != "no" then PKG_CHECK_MODULES(SWSCALE,[libswscale], @@ -3002,7 +3030,8 @@ dnl from VLC. dnl AC_ARG_ENABLE(imgresample, -[ --enable-imgresample deprecated libavcodec image scaling and conversion (default disabled)]) + AS_HELP_STRING([--enable-imgresample],[deprecated libavcodec image scaling + and conversion (default disabled)])) if test "${enable_imgresample}" = "yes" then PKG_CHECK_MODULES(IMGRESAMPLE,[libavcodec], @@ -3079,7 +3108,7 @@ then then dnl Use a custom faad AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) - VLC_ADD_BUILTINS([faad]) + VLC_ADD_PLUGIN([faad]) VLC_ADD_LIBS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a]) VLC_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include]) else @@ -3127,7 +3156,7 @@ then then dnl Use a custom twolame AC_MSG_RESULT(${real_twolame_tree}/libtwolame/.libs/libtwolame.a) - VLC_ADD_BUILTINS([twolame]) + VLC_ADD_PLUGIN([twolame]) VLC_ADD_LIBS([twolame],[${real_twolame_tree}/libtwolame/.libs/libtwolame.a]) VLC_ADD_CPPFLAGS([twolame],[-I${real_twolame_tree}/libtwolame -DLIBTWOLAME_STATIC]) else @@ -3159,7 +3188,7 @@ if test "${enable_quicktime}" != "no" && (test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes") then if test "${SYS}" = "mingw32"; then - VLC_ADD_BUILTINS([quicktime]) + VLC_ADD_PLUGIN([quicktime]) else AC_CHECK_HEADERS(QuickTime/QuickTime.h, [ VLC_ADD_PLUGIN([quicktime]) @@ -3239,7 +3268,7 @@ then VLC_ADD_LIBS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs]) LDFLAGS="${LDFLAGS_save} ${LIBS_a52tofloat32}" AC_CHECK_LIB(a52, a52_free, [ - VLC_ADD_BUILTINS([a52tofloat32]) + VLC_ADD_PLUGIN([a52tofloat32]) VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE]) VLC_ADD_LIBS([a52tofloat32],[-la52]) ],[ @@ -3298,7 +3327,8 @@ AS_IF([test "x${with_dts_tree}" != "x"], [ ]) AC_ARG_ENABLE(dca, - [ --enable-dca DTS Coherent Acoustics support with libdca (default enabled)]) + AS_HELP_STRING([--enable-dca],[DTS Coherent Acoustics support with libdca + (default enabled)])) AS_IF([test "${enable_dca}" != "no"], [ AC_ARG_WITH(dca-tree, [ --with-dca-tree=PATH libdca tree for static linking],, @@ -3384,8 +3414,7 @@ if test "${enable_libmpeg2}" != "no" then AC_ARG_WITH(libmpeg2-tree, [ --with-libmpeg2-tree=PATH libmpeg2 tree for static linking]) - if test -n "${with_libmpeg2_tree}" - then + AS_IF([test -n "${with_libmpeg2_tree}"],[ AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_tree}) real_libmpeg2_tree="`cd ${with_libmpeg2_tree} 2>/dev/null && pwd`" if test -z "${real_libmpeg2_tree}" @@ -3398,34 +3427,22 @@ then then dnl Use a custom libmpeg2 AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a) - VLC_ADD_BUILTINS([libmpeg2]) + VLC_ADD_PLUGIN([libmpeg2]) VLC_ADD_LIBS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2]) VLC_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include]) - eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`" else dnl The given libmpeg2 wasn't built AC_MSG_RESULT(no) AC_MSG_ERROR([cannot find ${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a, make sure you compiled libmpeg2 in ${with_libmpeg2_tree}]) fi - else - AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [ - AC_MSG_CHECKING(for libmpeg2 version >= 0.3.2) - AC_EGREP_CPP(yes, - [#include - #ifdef MPEG2_RELEASE - #if MPEG2_RELEASE >= MPEG2_VERSION(0,3,2) - yes - #endif - #endif], - [AC_MSG_RESULT([yes]) + ],[ + PKG_CHECK_MODULES(LIBMPEG2,[libmpeg2 > 0.3.2],[ VLC_ADD_PLUGIN([libmpeg2]) - VLC_ADD_LIBS([libmpeg2],[-lmpeg2])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])], - - [AC_MSG_ERROR([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ (you need the cvs version). Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])] - ) - fi + VLC_ADD_LIBS([libmpeg2], $LIBMPEG2_LIBS) + VLC_ADD_CFLAGS([libmpeg2], $LIBMPEG2_CFLAGS) + ], + AC_MSG_WARN([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ . Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])) + ]) fi dnl @@ -3542,7 +3559,7 @@ then real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`" if test -f "${real_tarkin_tree}/tarkin.o" then - VLC_ADD_BUILTINS([tarkin]) + VLC_ADD_PLUGIN([tarkin]) VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}]) VLC_ADD_LIBS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg]) AC_MSG_RESULT(yes) @@ -3697,9 +3714,11 @@ dnl telx module dnl uncompatible dnl AC_ARG_ENABLE(zvbi, - [ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)]) + AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with + libzvbi (default enabled)])) AC_ARG_ENABLE(telx, - [ --enable-telx Teletext decoding module (conflicting with zvbi) (default disabled)]) + AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with + zvbi) (default disabled)])) AS_IF( [test "${enable_zvbi}" != "no"],[ AS_IF( [test "${enable_telx}" = "yes"],[ @@ -3750,6 +3769,9 @@ AS_IF( [test "${enable_asademux}" = "yes"], [ [ VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS]) VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS]) + if test "${SYS}" = "mingw32"; then + VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC]) + fi VLC_ADD_PLUGIN([asademux]) ],[ AC_MSG_WARN([PCRE library not found (required for asademux)]) @@ -3856,23 +3878,9 @@ if test "${enable_xvideo}" != "no" && AC_CHECK_HEADERS(X11/extensions/Xv.h, [ CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" 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 /usr/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then VLC_ADD_PLUGIN([xvideo]) VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) - else - AC_CHECK_LIB(Xv_pic,XvPutImage,[ - VLC_ADD_PLUGIN([xvideo]) - VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) - VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic]) - ],[ - VLC_ADD_BUILTINS([xvideo]) - VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) - VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) - ]) - fi ]) CFLAGS="${CFLAGS_save}" ] @@ -4742,7 +4750,7 @@ dnl dnl UPnP Plugin (Intel SDK) dnl AC_ARG_ENABLE(upnp, - [AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)])]) + AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)])) VLC_ADD_CXXFLAGS([upnp_intel], [ ]) AS_IF([test "x${enable_upnp}" != "xno"], [ @@ -4771,7 +4779,7 @@ AC_ARG_WITH(,[Interface plugins:]) dnl special case for BeOS if test "${SYS}" = "beos" then - VLC_ADD_BUILTINS([beos]) + VLC_ADD_PLUGIN([beos]) fi dnl @@ -4860,7 +4868,9 @@ AS_IF([test "${enable_qt4}" != "no"], [ ], [ VLC_ADD_LIBS([qt4],[$QT4_LIBS]) ]) - VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"]) + QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/" + AC_SUBST(QT4LOCALEDIR) + VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"]) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) @@ -4882,7 +4892,7 @@ AC_ARG_ENABLE(wince, [ --enable-wince Windows CE interface (default enabled with MinGW)]) if test "${enable_wince}" != "no"; then if test "${SYS}" = "mingwce"; then - VLC_ADD_BUILTINS([wince]) + VLC_ADD_PLUGIN([wince]) VLC_ADD_CXXFLAGS([wince],[]) VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) dnl Gross hack @@ -4951,6 +4961,7 @@ then VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QuickTime]) VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore]) VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) @@ -5143,7 +5154,8 @@ dnl AtmoLight (homebrew AmbiLight) dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then AC_ARG_ENABLE(atmo, -[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) +AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight) + (default enabled)])) if test "${enable_atmo}" != "no"; then AC_LANG_PUSH(C++) VLC_ADD_PLUGIN([atmo]) @@ -5279,7 +5291,8 @@ dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?) dnl loader=false AC_ARG_ENABLE(loader, - [ --enable-loader build DLL loader for ELF i386 platforms (default disabled)]) + AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms + (default disabled)])) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AS_IF([test "${enable_loader}" = "yes"], [ VLC_ADD_PLUGIN([dmo]) @@ -5307,7 +5320,8 @@ dnl Microsoft ActiveX support dnl activex=false AC_ARG_ENABLE(activex, - [ --enable-activex build a vlc-based ActiveX control (default enabled on Win32)]) + AS_HELP_STRING([--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" @@ -5357,7 +5371,8 @@ dnl Mozilla plugin dnl mozilla=false AC_ARG_ENABLE(mozilla, - [ --enable-mozilla build a vlc-based Firefox/Mozilla plugin (default disabled)]) + AS_HELP_STRING([--enable-mozilla],[build a vlc-based Firefox/Mozilla plugin + (default disabled)])) AC_ARG_WITH(mozilla-sdk-path, [ --with-mozilla-sdk-path=PATH path to mozilla sdk]) AC_LANG_PUSH(C++) @@ -5693,17 +5708,22 @@ AS_IF([test "${SYS}" = "mingw32"], [ dnl dnl Stuff used by the program dnl -AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string]) -AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) ${COPYRIGHT_YEARS} the VideoLAN team", [Copyright string]) +VERSION_MESSAGE="${VERSION} ${CODENAME}" +COPYRIGHT_MESSAGE="VLC media player - version ${VERSION_MESSAGE} - (c) ${COPYRIGHT_YEARS} the VideoLAN team" +AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string]) AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number]) +AC_SUBST(COPYRIGHT_MESSAGE) +AC_SUBST(VERSION_MESSAGE) AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_REVISION) +AC_SUBST(COPYRIGHT_YEARS) AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) if test "${build_os}" = "cygwin" then @@ -5726,6 +5746,11 @@ dnl Restore *FLAGS dnl VLC_RESTORE_FLAGS +dnl +dnl Sort the modules list +dnl +PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs ) + dnl dnl Create the vlc-config script dnl @@ -5755,6 +5780,11 @@ VLC_OUTPUT_VLC_CONFIG_IN AC_CONFIG_FILES([ extras/package/win32/vlc.win32.nsi + extras/package/macosx/Info.plist + extras/package/macosx/Resources/English.lproj/InfoPlist.strings + extras/package/macosx/plugin/Info.plist + extras/package/macosx/plugin/InstallerInfo.plist + extras/package/macosx/plugin/English.lproj/InfoPlist.strings Makefile projects/activex/Makefile projects/activex/axvlc.inf @@ -5857,7 +5887,7 @@ AC_OUTPUT ${SHELL} ./config.status --file=vlc-config chmod 0755 vlc-config -/bin/echo -n "Enabled modules :" +/bin/echo -n "Enabled modules: " ./vlc-config --list plugin dnl Shortcut to nice compile message