X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=21f058d690145c256911313bbe43b707484313a1;hb=6ee349c97a50a61c7d81769fd22cd6a9a4a8aacf;hp=d61e27a71d939e99067c62084a5a6f81e62fb117;hpb=ba894d9bb3961c1ea8a46ea5e8f3cb22e1346a3e;p=vlc diff --git a/configure.ac b/configure.ac index d61e27a71d..21f058d690 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,8 @@ case "${target_os}" in SYS="${target_os}" CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" ;; - darwin*) + darwin1.[0123]) + dnl Mac OS X < 10.3 SYS=darwin CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" @@ -154,6 +155,15 @@ case "${target_os}" in VLC_ADD_CFLAGS([vlc],[-x objective-c]) VLC_ADD_LDFLAGS([vlc],[-Wl,-m -Wl,-multiply_defined -Wl,suppress]) ;; + darwin*) + SYS=darwin + CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}" + VLC_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation]) + VLC_ADD_CFLAGS([libvlc],[-x objective-c]) + VLC_ADD_CFLAGS([vlc],[-x objective-c]) + ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) @@ -208,7 +218,7 @@ 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],[-lbe]) + VLC_ADD_LDFLAGS([vlc beos logger],[-lbe]) VLC_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame]) dnl Check for BONE @@ -232,6 +242,20 @@ AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") +dnl +dnl Check for Mac OS X SDK settings +dnl +AC_ARG_WITH(macosx-sdk, + [ --with-macosx-sdk compile for Mac OS X 10.3 SDK],[], with_macosx_sdk=no) +if test "${with_macosx_sdk}" != "no" ; then + CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; OBJCFLAGS="${OBJCFLAGS_save}" + LDFLAGS_save="${LDFLAGS_save} -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk"; LDFLAGS="${LDFLAGS_save}" + export MACOSX_DEPLOYMENT_TARGET=10.3 + MACOSX_DEPLOYMENT_TARGET="10.3" +fi + dnl dnl Gettext stuff dnl @@ -677,6 +701,7 @@ AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(machine/param.h sys/shm.h) AC_CHECK_HEADERS(linux/version.h) +AC_CHECK_HEADERS(syslog.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" AC_HEADER_TIME @@ -909,15 +934,12 @@ if test "${ac_cv_c_dynamic_no_pic}" != "no"; then fi dnl Check for Darwin plugin linking flags -AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic], +AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error], [ac_cv_ld_darwin], - [CFLAGS="${CFLAGS_save} -bundle -undefined error -lcc_dynamic" + [CFLAGS="${CFLAGS_save} -bundle -undefined error" AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) if test "${ac_cv_ld_darwin}" != "no"; then VLC_ADD_LDFLAGS([plugin],[-bundle -undefined error]) - AC_CHECK_LIB(cc_dynamic, main,[ - VLC_ADD_LDFLAGS([plugin],[-lcc_dynamic]) - ]) fi dnl Check for standard plugin linking flags @@ -1501,7 +1523,7 @@ dnl dv module: digital video module check for libraw1394 dnl AC_ARG_ENABLE(dv, [ --enable-dv dv input module (default disabled)]) -if test "{enable_dv}" = "yes" +if test "${enable_dv}" = "yes" then AC_ARG_WITH(dv-raw1394, [ --with-dv-raw1394=PATH libraw1394 headers and libraries]) @@ -1725,10 +1747,12 @@ if test "${enable_dshow}" != "no" then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then + AC_LANG_PUSH(C++) AC_CHECK_HEADERS(dshow.h, [ VLC_ADD_PLUGINS([dshow]) VLC_ADD_CXXFLAGS([dshow],[]) VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32 -luuid]) ]) + AC_LANG_POP(C++) fi fi @@ -1753,7 +1777,7 @@ dnl dnl libdvbpsi ts demux/mux dnl AC_ARG_ENABLE(dvbpsi, -[ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)]) + [ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)]) if test "${enable_dvbpsi}" != "no" then AC_ARG_WITH(dvbpsi, @@ -1878,7 +1902,7 @@ dnl dnl gnomeVFS access module dnl AC_ARG_ENABLE(gnomevfs, - [ --enable-gnomevfs GnomeVFS access module (default enabled)]) + [ --enable-gnomevfs GnomeVFS access module (default enabled)]) if test "${enable_gnomevfs}" != "no" -a "${SYS}" = "linux" then PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0, @@ -2126,7 +2150,7 @@ AC_ARG_ENABLE(ogg, if test "${enable_ogg}" != "no" then AC_ARG_WITH(ogg-tree, - [ --with-ogg-tree=PATH ogg tree for static linking]) + [ --with-ogg-tree=PATH ogg tree for static linking]) if test -n "${with_ogg_tree}" then AC_MSG_CHECKING(for libogg.a in ${with_ogg_tree}) @@ -2294,7 +2318,7 @@ then fi AC_ARG_WITH(mad-tree, - [ --with-mad-tree=PATH mad tree for static linking],[],[]) + [ --with-mad-tree=PATH mad tree for static linking],[],[]) if test "${with_mad_tree}" != "no" -a -n "${with_mad_tree}" then real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`" @@ -2347,69 +2371,151 @@ AC_CHECK_HEADERS(id3tag.h, [ dnl dnl ffmpeg decoder/demuxer plugin dnl -dnl we try to find ffmpeg using : 1- ffmpeg-config, 2- pkg-config -dnl 3- default place, 4- given tree +dnl we try to find ffmpeg using : 1- given tree 2- ffmpeg-config, 3- pkg-config +dnl 4- default place, AC_ARG_ENABLE(ffmpeg, [ --enable-ffmpeg ffmpeg codec (default enabled)]) if test "${enable_ffmpeg}" != "no" then -dnl Look for a ffmpeg-config (we are on debian ) - - FFMPEG_PATH="${PATH}" - AC_ARG_WITH(ffmpeg-config-path, - [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)], - [ if test "${with_ffmpeg_config_path}" != "no" - then - FFMPEG_PATH="${with_ffmpeg_config_path}" - fi ]) - AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH}) - if test "${FFMPEG_CONFIG}" != "no" - then - AC_CHECK_HEADERS(ffmpeg/avcodec.h) - AC_CHECK_HEADERS(postproc/postprocess.h) - VLC_ADD_PLUGINS([ffmpeg]) - if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([stream_out_switcher]) - fi - VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) - - else dnl Those options have to be here because the .pc can be bogus for ffmpeg previous nov 05 - AC_ARG_WITH(ffmpeg-mp3lame, - [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support], - [ - if test "$with_ffmpeg_mp3lame" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) - fi]) + AC_ARG_WITH(ffmpeg-mp3lame, + [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support], + [ + if test "$with_ffmpeg_mp3lame" = "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) + fi]) + + AC_ARG_WITH(ffmpeg-faac, + [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], + [ + if test "$with_ffmpeg_faac" = "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) + fi]) + + AC_ARG_WITH(ffmpeg-dts, + [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support], + [ + if test "$with_ffmpeg_dts" = "yes"; then + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" + AC_CHECK_LIB(dts_pic, dts_free, + [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ], + [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ]) + LDFLAGS="${LDFLAGS_save}" + fi]) + + AC_ARG_WITH(ffmpeg-zlib, + [ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support], + [ + if test "$with_ffmpeg_zlib" = "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lz]) + fi]) + + dnl + dnl test for --with-ffmpeg-tree + dnl + AC_ARG_WITH(ffmpeg-tree, + [ --with-ffmpeg-tree=PATH ffmpeg tree for static linking]) + + if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}"; then + AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree}) + real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" + if test -z "${real_ffmpeg_tree}"; then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}]) + fi + if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then + dnl The given libavcodec wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}]) + fi + if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then + 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]) + fi + dnl Use a custom libffmpeg + AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - AC_ARG_WITH(ffmpeg-faac, - [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], - [ - if test "$with_ffmpeg_faac" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) - fi]) + if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_zlib}" != "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lz]) + fi + fi + if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_mp3lame}" != "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) + fi + fi + if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_faac}" != "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) + fi + fi + if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_dts}" != "yes"; then + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" + AC_CHECK_LIB(dts_pic, dts_free, + [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ], + [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ]) + LDFLAGS="${LDFLAGS_save}" + fi + fi + if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lvorbis -lvorbisenc]) + fi + if fgrep -s "CONFIG_FAAD=yes" "${real_ffmpeg_tree}/config.mak"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lfaad]) + fi + if fgrep -s "CONFIG_XVID=yes" "${real_ffmpeg_tree}/config.mak"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore]) + fi - AC_ARG_WITH(ffmpeg-dts, - [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support], - [ - if test "$with_ffmpeg_dts" = "yes"; then - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" - AC_CHECK_LIB(dts_pic, dts_free, - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ], - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ]) - LDFLAGS="${LDFLAGS_save}" - fi]) - - AC_ARG_WITH(ffmpeg-zlib, - [ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support], - [ - if test "$with_ffmpeg_zlib" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lz]) - fi]) + VLC_ADD_BUILTINS([ffmpeg]) + if test "${enable_sout}" != "no"; then + VLC_ADD_BUILTINS([stream_out_switcher]) + fi + + if test -f "${real_ffmpeg_tree}/libavutil/libavutil.a"; then + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavutil ${real_ffmpeg_tree}/libavutil/libavutil.a]) + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavutil]) + fi + + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a]) + 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.]) + 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 +else + +dnl Look for a ffmpeg-config (we are on debian ) + + FFMPEG_PATH="${PATH}" + AC_ARG_WITH(ffmpeg-config-path, + [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)], + [ if test "${with_ffmpeg_config_path}" != "no" + then + FFMPEG_PATH="${with_ffmpeg_config_path}" + fi ]) + AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH}) + if test "${FFMPEG_CONFIG}" != "no" + then + AC_CHECK_HEADERS(ffmpeg/avcodec.h) + AC_CHECK_HEADERS(postproc/postprocess.h) + VLC_ADD_PLUGINS([ffmpeg]) + if test "${enable_sout}" != "no"; then + VLC_ADD_PLUGINS([stream_out_switcher]) + fi + VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) + + else dnl Trying with pkg-config PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], @@ -2426,9 +2532,8 @@ dnl Trying with pkg-config ],[ dnl - dnl test for !(--with-ffmpeg-tree) + dnl last chance: at the default place dnl - if test "${with_ffmpeg_tree}" = "no" -o -z "${with_ffmpeg_tree}"; then 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.])] ) @@ -2453,94 +2558,13 @@ dnl Trying with pkg-config VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" - fi - - dnl - dnl test for --with-ffmpeg-tree - dnl - if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}"; then - AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree}) - real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" - if test -z "${real_ffmpeg_tree}"; then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}]) - fi - if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then - dnl The given libavcodec wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}]) - fi - if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then - 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]) - fi - dnl Use a custom libffmpeg - AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - - if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_zlib}" != "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lz]) - fi - fi - if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_mp3lame}" != "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) - fi - fi - if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_faac}" != "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) - fi - fi - if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_dts}" != "yes"; then - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" - AC_CHECK_LIB(dts_pic, dts_free, - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ], - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ]) - LDFLAGS="${LDFLAGS_save}" - fi - fi - if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lvorbis -lvorbisenc]) - fi - if fgrep -s "CONFIG_FAAD=yes" "${real_ffmpeg_tree}/config.mak"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lfaad]) - fi - if fgrep -s "CONFIG_XVID=yes" "${real_ffmpeg_tree}/config.mak"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore]) - fi - - VLC_ADD_BUILTINS([ffmpeg]) - if test "${enable_sout}" != "no"; then - VLC_ADD_BUILTINS([stream_out_switcher]) - fi - - if test -f "${real_ffmpeg_tree}/libavutil/libavutil.a"; then - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavutil ${real_ffmpeg_tree}/libavutil/libavutil.a]) - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavutil]) - fi - - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a]) - 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.]) - 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 - fi ]) - AC_ARG_WITH(ffmpeg-tree, - [ --with-ffmpeg-tree=PATH ffmpeg tree for static linking]) - fi + fi fi dnl -dnl ffmpeg decoder/demuxer plugin +dnl ffmpegaltivec plugin dnl AC_ARG_ENABLE(ffmpegaltivec, [ --enable-ffmpegaltivec ffmpegaltivec codec (DO NOT USE)]) @@ -3118,12 +3142,11 @@ dnl AC_ARG_ENABLE(dirac, [ --enable-dirac experimental dirac codec (default disabled)]) if test "${enable_dirac}" = "yes"; then - AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [ - AC_CHECK_LIB(dirac_decoder, dirac_decoder_init, [ + PKG_CHECK_MODULES(DIRAC,dirac, [ VLC_ADD_PLUGINS([dirac]) - VLC_ADD_LDFLAGS([dirac],[-ldirac_decoder -ldirac_encoder -lstdc++]) ],[ - AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])], - [-lstdc++]) + VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS]) + VLC_ADD_LDFLAGS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ + AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.]) ]) fi @@ -3560,6 +3583,16 @@ then [AC_MSG_WARN(SVG library not found)]) fi +dnl +dnl Snapshot vout module (with cache) +dnl +AC_ARG_ENABLE(snapshot, + [ --enable-snapshot snapshot module (default disabled)]) +if test "${enable_snapshot}" = "yes" +then + VLC_ADD_PLUGINS([snapshot]) +fi + dnl dnl Qt Embedded module dnl (disabled by default) @@ -3705,6 +3738,41 @@ then VLC_ADD_LDFLAGS([svgalib],[-lvgagl -lvga]) fi +dnl +dnl DirectFB module +dnl +AC_ARG_ENABLE(directfb, + [ --enable-directfb DirectFB support (default disabled)]) +if test "${enable_directfb}" = "yes" +then + if test "${with_directfb}" = "no" + then + AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false") + if test "${have_directfb}"= "true" + then + VLC_ADD_PLUGINS([directfb]) + VLC_ADD_LDFLAGS([directfb],[-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl]) + VLC_ADD_CPPFLAGS([directfb],[-I/usr/include/directfb -D_REENTRANT]) + else + AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb]) + fi + else + CPPFLAGS_save="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${with_directfb}/include" + AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false") + CPPFLAGS="${CPPFLAGS_save}" + AC_ARG_WITH(directfb, + [ --with-directfb=PATH path to directfb], + [ if test "${with_directfb}" != "no" -a -n "${with_directfb}" + then + VLC_ADD_PLUGINS([directfb]) + VLC_ADD_CPPFLAGS([directfb],[-I${with_directfb}/include -D_REENTRANT]) + VLC_ADD_LDFLAGS([directfb],[-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl]) + fi ], + [ AC_MSG_ERROR([cannot find directfb headers in ${with_directfb}/include]) ]) + fi +fi + dnl dnl GGI module dnl @@ -3908,14 +3976,14 @@ fi dnl dnl CoreAudio plugin dnl -AC_ARG_ENABLE(coreaudio, - [ --enable-coreaudio CoreAudio module (default enabled on MacOS X)]) -if test "${enable_coreaudio}" != "no" && - (test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes") +AC_ARG_ENABLE(macosx-audio, + [ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)]) +if test "${enable_macosx-audio}" != "no" && + (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, - [ VLC_ADD_BUILTINS([coreaudio auhal]) - VLC_ADD_LDFLAGS([coreaudio auhal],[-framework CoreAudio -framework AudioUnit -framework AudioToolbox]) + [ VLC_ADD_BUILTINS([auhal]) + VLC_ADD_LDFLAGS([auhal],[-framework CoreAudio -framework AudioUnit -framework AudioToolbox]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3959,7 +4027,7 @@ AS_IF([test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_c CPPFLAGS_cyberlink="-I${real_cyberlink_tree}/include" CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}" AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h], - [ VLC_ADD_CPPFLAGS([upnp], [${CPPFLAGS_cyberlink}]) + [ VLC_ADD_CXXFLAGS([upnp], [${CPPFLAGS_cyberlink}]) VLC_ADD_PLUGINS([upnp]) ],[ AC_MSG_ERROR([cannot find CyberLink for C++ headers]) @@ -4541,8 +4609,10 @@ AC_ARG_ENABLE(bonjour, [ --enable-bonjour Bonjour services discovery (default enabled)]) if test "${enable_bonjour}" != "no" then - PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.3 avahi-client < 0.6, - [AC_DEFINE(HAVE_AVAHI_CLIENT, [], [Define if you have the avahi-client library]) + PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.3, + [PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.6, + [AC_DEFINE(HAVE_AVAHI_06, [], [Define if you have avahi-client 0.6 or greater])],) + AC_DEFINE(HAVE_AVAHI_CLIENT, [], [Define if you have the avahi-client library]) VLC_ADD_LDFLAGS([bonjour access_output_http],[$BONJOUR_LIBS]) VLC_ADD_CFLAGS([bonjour access_output_http],[$BONJOUR_CFLAGS]) VLC_ADD_PLUGINS([bonjour]) ], @@ -4678,16 +4748,21 @@ then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then AC_CHECK_PROGS(MIDL, [midl widl], no) + AC_LANG_PUSH(C++) AC_CHECK_HEADERS(ole2.h olectl.h, [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) AC_CHECK_HEADERS(objsafe.h, - VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]) + VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),, + [#if HAVE_OLE2_H + # include + #endif] ) activex=: ], [ AC_MSG_ERROR([required OLE headers are missing from your system]) ] ) + AC_LANG_POP(C++) fi fi AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)]) @@ -4703,74 +4778,81 @@ AC_ARG_ENABLE(mozilla, AC_ARG_WITH(mozilla-sdk-path, [ --with-mozilla-sdk-path=PATH path to mozilla sdk]) -if test "${enable_mozilla}" = "yes" -a "${with_mozilla_sdk_path}" = "" +if test "${enable_mozilla}" = "yes" then - AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no) - if test "${MOZILLA_CONFIG}" = "no" + if test "${with_mozilla_sdk_path}" = "" then - AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) + 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 + LDFLAGS="${LDFLAGS_save} -L${x_libraries}" + AC_CHECK_LIB(Xt,XtStrings, + [VLC_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt -lX11 -lSM -lICE])], + [], + [[-L${x_libraries} -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`]) + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" + AC_CHECK_HEADERS(mozilla-config.h) + CPPFLAGS="${CPPFLAGS_save}" + XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \ + `${MOZILLA_CONFIG} --idlflags plugin xpcom java` " + xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin" + fi else - if test "${SYS}" != "mingw32"; then - LDFLAGS="${LDFLAGS_save} -L${x_libraries}" - AC_CHECK_LIB(Xt,XtStrings, - [VLC_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt -lX11 -lSM -lICE])], - [], - [[-L${x_libraries} -lX11 -lSM -lICE] - ]) - LDFLAGS="${LDFLAGS_save}" + dnl special case for mingw32 + if test "${SYS}" = "mingw32" + then + AC_CHECK_TOOL(CYGPATH, cygpath, "") + dnl latest gecko sdk does not have an xpcom directory + if test -d "${with_mozilla_sdk_path}/xpcom"; then + mozilla_sdk_xpcom="/xpcom" + fi 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`]) - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" - AC_CHECK_HEADERS(mozilla-config.h) + + real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" + CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" + 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} -L${x_libraries}" + 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 + + XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl" + xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin" + + if test -n "${CYGPATH}"; then + real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" + XPIDL_INCL="${XPIDL_INCL} -I\"${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl\"" + fi ]) CPPFLAGS="${CPPFLAGS_save}" fi - -dnl special case for mingw32 -elif test "${enable_mozilla}" = "yes" -then - if test "${SYS}" = "mingw32"; then - AC_CHECK_TOOL(CYGPATH, cygpath, "") - mozilla_sdk_xpcom="/xpcom" - fi - - real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" - CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" - AC_CHECK_HEADERS(mozilla-config.h, [ - mozilla=: - VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -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 - VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at]) + + if test "${mozilla}" != "false" + then + build_pic=yes + AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path} /usr/lib/mozilla) + if test "${XPIDL}" = "no"; then + AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.]) fi - - XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl" - XPIDL="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin/xpidl" - - if test -n "${CYGPATH}"; then - real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" - XPIDL_INCL="${XPIDL_INCL} -I\"${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl\"" - fi ]) - CPPFLAGS="${CPPFLAGS_save}" -fi - -dnl Not necessarily in ${PATH} -if test -z "${XPIDL}" -o ! -x "${XPIDL}"; then - XPIDL="/usr/lib/mozilla/xpidl" -fi -AS_IF([test "${MOZILLA_CONFIG}"], [ - if test -z "${XPIDL_INCL}"; then - XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \ - `${MOZILLA_CONFIG} --idlflags plugin xpcom java` " fi -]) -AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) -if test "${mozilla}" != "false" -then - build_pic=yes fi +AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) dnl dnl Python bindings @@ -4788,7 +4870,7 @@ dnl dnl Java bindings dnl AC_ARG_ENABLE(java-bindings, - [ --enable-java-bindings Enable Java bindings (default disabled)]) + [ --enable-java-bindings Enable Java bindings (default disabled)]) AM_CONDITIONAL( BUILD_JAVA, [test "${enable_java_bindings}" = "yes"] ) if test "${enable_java_bindings}" = "yes" then @@ -4956,11 +5038,6 @@ AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module func VLC_ENTRY="vlc_entry__${module_symbol}" AC_SUBST(VLC_ENTRY) -DATA_PATH="${ac_tool_prefix}/share/vlc" -AC_SUBST(DATA_PATH) -PLUGIN_PATH="${ac_tool_prefix}/lib/vlc" -AC_SUBST(PLUGIN_PATH) - dnl dnl Handle substvars that use $(top_srcdir) dnl @@ -4993,6 +5070,7 @@ AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) AC_SUBST(INCLUDES) AC_SUBST(ALL_LINGUAS) +AC_SUBST(MACOSX_DEPLOYMENT_TARGET) dnl Import substitutions generated by bootstrap VLC_SUBSTS