X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=08cba4cebf2762d84a217cefc8a4c53ab22d3ec9;hb=7734ca0c9c0d6dec232a3ab3beb9267cf97eefa4;hp=94b31c117964d6be5b4707da42ed06a011d47c69;hpb=b6d512b6f05a481727d0e360ec079c3c455c1f3c;p=vlc diff --git a/configure.ac b/configure.ac index 94b31c1179..08cba4cebf 100644 --- a/configure.ac +++ b/configure.ac @@ -4,8 +4,8 @@ dnl $Id$ AC_INIT(vlc,0.8.5-svn) VERSION_MAJOR="0" VERSION_MINOR="8" -VERSION_REVISION="4" -VERSION_EXTRA="test1" +VERSION_REVISION="5" +VERSION_EXTRA="svn" CONFIGURE_LINE="$0 $*" CODENAME="Janus" @@ -97,10 +97,10 @@ dnl kludge because only the debian package provides a ffmpeg-config 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; then - export PKG_CONFIG_PATH=${topdir}/extras/contrib/bin:$PKG_CONFIG_PATH -dnl else -dnl export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/bin + if test $build = $host; 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" @@ -235,7 +235,7 @@ AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") dnl dnl Gettext stuff dnl -ALL_LINGUAS="ca da de en_GB es fr it ja ko nl pt_BR ro ru tr zh_CN zh_TW" +ALL_LINGUAS="ca da de en_GB es fr it ja ko nl 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 @@ -677,6 +677,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 @@ -731,12 +732,21 @@ AC_ARG_ENABLE(hal, if test "${enable_hal}" != "no" -a "${SYS}" = "linux" then - PKG_CHECK_MODULES(HAL, hal >= 0.2.97, - [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library]) - VLC_ADD_PLUGINS([hal]) - VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS]) - VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])], - [AC_MSG_WARN(HAL library not found)]) + PKG_CHECK_MODULES(HAL, hal >= 0.5.0, + [ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API]) + AC_DEFINE( HAVE_HAL, [], [Define if you have the HAL library] ) + VLC_ADD_PLUGINS([hal]) + VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS]) + VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])], + dnl No hal 0.5 Test for 0.2 + [ PKG_CHECK_MODULES( HAL, hal >= 0.2.97, + [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library]) + VLC_ADD_PLUGINS([hal]) + VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS]) + VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])], + [AC_MSG_WARN(HAL library not found)]) + ] + ) fi dnl Build the gtk_main plugins? @@ -1160,7 +1170,8 @@ fi dnl The AltiVec C extensions dnl dnl There are several possible cases: -dnl - OS X PPC, gcc 4.x: use -mpim-altivec, don't need +dnl - OS X PPC, gcc 4.x: use -mpim-altivec -force_cpusubtype_ALL, don't +dnl need dnl - OS X PPC, gcc 3.x: need -faltivec, don't need dnl - Linux PPC, gcc 3.4, 4.x: need which requires -maltivec dnl - Linux PPC, gcc 3.3: need and -maltivec -mabi=altivec @@ -1169,10 +1180,10 @@ dnl - Others: test should fail AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], [ac_cv_c_altivec], [# OS X/PPC test (gcc 4.x) - CFLAGS="${CFLAGS_save} -mpim-altivec" + CFLAGS="${CFLAGS_save} -mpim-altivec -force_cpusubtype_ALL" AC_TRY_COMPILE([], [vec_ld(0, (unsigned char *)0);], - [ac_cv_c_altivec="-mpim-altivec"], + [ac_cv_c_altivec="-mpim-altivec -force_cpusubtype_ALL"], [# OS X/PPC test (gcc 3.x) CFLAGS="${CFLAGS_save} -faltivec" AC_TRY_COMPILE([], @@ -1238,7 +1249,9 @@ AC_ARG_WITH(tuning, [ --with-tuning=ARCH enable special tuning for an architecture (default Pentium 2 on IA-32 and 750 on PPC)]) if test -n "${with_tuning}"; then - CFLAGS_TUNING="-mtune=${with_tuning}" + if test "${with_tuning}" != "no"; then + CFLAGS_TUNING="-mtune=${with_tuning}" + fi else if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then CFLAGS_TUNING="-mtune=pentium2" @@ -1314,6 +1327,15 @@ AC_ARG_ENABLE(release, [ --enable-release activate extra optimizations (default disabled)]) test "${enable_release}" != "yes" && enable_release="no" +dnl +dnl Is the shared libvlc forced ? +dnl +build_pic=no +AC_ARG_ENABLE(shared-libvlc, + [ --enable-shared-libvlc shared libvlc (default disabled EXPERIMENTAL)], + ,[shared_libvlc=no]) + + dnl dnl Stream output dnl @@ -1475,6 +1497,128 @@ if test "${enable_livedotcom}" = "yes"; then fi fi +dnl +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" +then + AC_ARG_WITH(dv-raw1394, + [ --with-dv-raw1394=PATH libraw1394 headers and libraries]) + AC_ARG_WITH(dv-raw1394-tree, + [ --with-dv-raw1394=PATH libraw1394 tree for static linking]) + + if test -z "${with_dv_raw1394}" -a "${with_dv_raw1394}" != "" + then + AC_MSG_CHECKING(for raw1394 headers in ${with_dv_raw1394}) + if test -f ${with_dv_raw1394}/include/libraw1394/raw1394.h + then + dnl Use ${with_dv_raw1394}/include/libraw1394/raw1394.h + AC_MSG_RESULT(yes) + VLC_ADD_PLUGINS([access_dv]) + VLC_ADD_LDFLAGS([access_dv],[-L${with_dv_raw1394}/lib -lraw1394 -lpthread]) + VLC_ADD_CPPFLAGS([access_dv],[-I${with_dv_raw1394}/include]) + else + dnl No libraw1394 could be found, sorry + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h]) + fi + else + AC_CHECK_HEADERS(libraw1394/raw1394.h, + [ VLC_ADD_PLUGINS([access_dv]) + VLC_ADD_LDFLAGS([access_dv],[-lraw1394 -lavc1394]) + ],[ + if test -n "${enable_dv}" + then + AC_MSG_ERROR([cannot find libraw1394 headers]) + fi + ]) + fi + + dnl Check for static linking of libraw1394 + if test -z "${with_dv_raw1394_tree}" -a "${with_dv_raw1394_tree}" != "" + then + AC_MSG_CHECKING(for libraw1394.a in ${with_dv_raw1394_tree}) + real_dv_raw1394_tree="`cd ${with_dv_raw1394_tree} 2>/dev/null && pwd`" + if test -z "${real_dv_raw1394_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${real_dv_raw1394_tree}]) + fi + if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a" + then + dnl Use a custom libraw1394 + AC_MSG_RESULT(${real_dv_raw1394_tree}/src/.libs/libraw1394.a) + VLC_ADD_BUILTINS([access_dv]) + VLC_ADD_LDFLAGS([access_dv],[-L${real_dv_raw1394_tree}/src/.libs -lraw1394]) + VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_raw1394_tree}]) + else + dnl The given libraw1394 wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_dv_raw1394_tree}/src/.libs/libraw1394.a, make sure you compiled libraw1394 in ${with_dv_raw1394_tree}]) + fi + fi + + dnl + dnl Check for libavc1394 + dnl + + AC_ARG_WITH(dv-avc1394, + [ --with-dv-avc1394=PATH libavc1394 headers and libraries]) + AC_ARG_WITH(dv-avc1394-tree, + [ --with-dv-avc1394=PATH libavc1394 tree for static linking]) + + if test -z "${with_dv_avc1394}" -a "${with_dv_avc1394}" != "" + then + AC_MSG_CHECKING(for avc1394 headers in ${with_dv_avc1394}) + if test -f ${with_dv_avc1394}/include/libavc1394/avc1394.h + then + dnl Use ${with_dv_avc1394}/include/libavc1394/avc1394.h + AC_MSG_RESULT(yes) + VLC_ADD_LDFLAGS([access_dv],[-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread]) + VLC_ADD_CPPFLAGS([access_dv],[-I${with_avc1394}/include]) + else + dnl No libavc1394 could be found, sorry + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${with_dv_avc1394}/include/libavc1394/avc1394.h]) + fi + else + AC_CHECK_HEADERS(libavc1394/avc1394.h, + [ VLC_ADD_LDFLAGS([access_dv],[-lavc1394 -lrom1394 -lpthread]) + ],[ + if test -n "${enable_dv}" + then + AC_MSG_ERROR([cannot find libavc1394 headers]) + fi + ]) + fi + + dnl Check for static linking of libavc1394 + if test -z "${with_dv_avc1394_tree}" -a "${with_dv_avc1394_tree}" != "" + then + AC_MSG_CHECKING(for libavc1394.a in ${with_dv_avc1394_tree}) + real_dv_avc1394_tree="`cd ${with_dv_avc1394_tree} 2>/dev/null && pwd`" + if test -z "${real_dv_avc1394_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${real_dv_avc1394_tree}]) + fi + if test -f "${real_dv_avc1394_tree}/src/.libs/libavc1394.a" + then + dnl Use a custom libavc1394 + AC_MSG_RESULT(${real_dv_avc1394_tree}/src/.libs/libavc1394.a) + VLC_ADD_LDFLAGS([access_dv],[-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread]) + VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_avc1394_tree}]) + else + dnl The given libavc1394 wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_dv_avc1394_tree}/src/.libs/libavc1394.a, make sure you compiled libavc1394 in ${with_dv_avc1394_tree}]) + fi + fi +fi dnl dnl dvdread module: check for libdvdread @@ -1736,7 +1880,7 @@ dnl gnomeVFS access module dnl AC_ARG_ENABLE(gnomevfs, [ --enable-gnomevfs GnomeVFS access module (default enabled)]) -if test "${enable_gnomevfs}" != "no" +if test "${enable_gnomevfs}" != "no" -a "${SYS}" = "linux" then PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0, VLC_ADD_LDFLAGS([access_gnomevfs],[$GNOMEVFS_LIBS]) @@ -2204,66 +2348,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 - VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) - fi]) + VLC_ADD_BUILTINS([ffmpeg]) + if test "${enable_sout}" != "no"; then + VLC_ADD_BUILTINS([stream_out_switcher]) + 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]) + 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], @@ -2280,9 +2509,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.])] ) @@ -2307,90 +2535,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 - VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) - 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)]) @@ -3019,7 +3170,7 @@ if test "${enable_x264}" != "no"; then AC_MSG_RESULT(yes) VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}]) VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}" AC_CHECK_LIB(x264, x264_encoder_open, [ VLC_ADD_BUILTINS([x264]) VLC_ADD_LDFLAGS([x264],[-lx264]) @@ -3032,7 +3183,7 @@ if test "${enable_x264}" != "no"; then AC_MSG_ERROR([the specified tree doesn't have x264.h]) fi else - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}" AC_CHECK_HEADERS(x264.h, [ AC_CHECK_LIB(x264, x264_encoder_open, [ VLC_ADD_PLUGINS([x264]) @@ -3410,6 +3561,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) @@ -3790,44 +3951,42 @@ dnl CyberLink for C++ UPnP stack dnl AC_ARG_ENABLE(cyberlink, [ --enable-cyberlink CyberLink for C++ UPnP stack (default disabled)]) -if test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_cyberlink}" != "no"); then +AS_IF([test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_cyberlink}" != "no")], [ AC_ARG_WITH(cyberlink-tree, [ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking]) dnl dnl test for --with-cyberlink-tree dnl - if test ! -z "${with_cyberlink_tree}" -a "${CXX}" != ""; then + AS_IF([test ! -z "${with_cyberlink_tree}" -a "${CXX}" != ""], [ AC_LANG_PUSH(C++) real_cyberlink_tree="`cd ${with_cyberlink_tree} 2>/dev/null && pwd`" - if test -z "${real_cyberlink_tree}" - then + AS_IF([test -z "${real_cyberlink_tree}"], [ dnl The given directory can't be found AC_MSG_RESULT(no) AC_MSG_ERROR([cannot cd to ${with_cyberlink_tree}]) - fi - CXXFLAGS_save="${CXXFLAGS}" - CXXFLAGS_cyberlink="-I${real_cyberlink_tree}/include" - CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_cyberlink}" + ]) + CPPFLAGS_save="${CPPFLAGS}" + CPPFLAGS_cyberlink="-I${real_cyberlink_tree}/include" + CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}" AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h], - [ VLC_ADD_CXXFLAGS([upnp], [${CXXFLAGS_cyberlink}]) + [ VLC_ADD_CXXFLAGS([upnp], [${CPPFLAGS_cyberlink}]) VLC_ADD_PLUGINS([upnp]) ],[ AC_MSG_ERROR([cannot find CyberLink for C++ headers]) ]) AC_MSG_CHECKING(for libclink.a in ${with_cyberlink_tree}) - if test -f "${real_cyberlink_tree}/lib/unix/libclink.a" - then + AS_IF([test -f "${real_cyberlink_tree}/lib/unix/libclink.a"], [ AC_MSG_RESULT(${real_cyberlink_tree}/lib/unix/libclink.a) VLC_ADD_LDFLAGS([upnp], [${real_cyberlink_tree}/lib/unix/libclink.a -lexpat]) - else + ], [ AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}]) - fi - CXXFLAGS="${CXXFLAGS_save}" + AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}]) + ]) + CPPFLAGS="${CPPFLAGS_save}" AC_LANG_POP([C++]) - fi -fi + ]) +]) dnl dnl Interface plugins @@ -4372,43 +4531,6 @@ then fi fi -dnl -dnl SLP access plugin -dnl -AC_ARG_ENABLE(slp, - [ --enable-slp SLP service discovery support (default disabled)]) -if test "${enable_slp}" = "yes" -then - AC_ARG_WITH(slp, - [ --with-slp=PATH libslp headers and libraries]) - if test -z "${with_slp}" - then - AC_CHECK_HEADERS(slp.h, have_slp="true", have_slp="false") - if test "${have_slp}" = "true" - then - VLC_ADD_PLUGINS([slp]) - VLC_ADD_LDFLAGS([slp],[-lslp]) - VLC_ADD_LDFLAGS([stream_out_standard],[-lslp]) - fi - else - AC_MSG_CHECKING(for slp headers in ${with_slp}) - if test -f ${with_slp}/slp.h - then - dnl Use ${with_slp}/libslp/slp.h - AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([slp]) - VLC_ADD_LDFLAGS([slp],[-L${with_slp} -lslp]) - VLC_ADD_LDFLAGS([stream_out_standard],[-L${with_slp} -lslp]) - VLC_ADD_CPPFLAGS([slp],[-I${with_slp}]) - AC_DEFINE(HAVE_SLP_H) - else - dnl No libslp could be found, sorry - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${with_slp}/slp.h]) - fi - fi -fi - dnl dnl DAAP access plugin and services discovery dnl @@ -4431,7 +4553,9 @@ AC_ARG_ENABLE(bonjour, if test "${enable_bonjour}" != "no" then PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.3, - [AC_DEFINE(HAVE_AVAHI_CLIENT, [], [Define if you have the avahi-client library]) + [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]) ], @@ -4453,14 +4577,6 @@ then fi fi -dnl -dnl Joystick plugin -dnl -AC_ARG_ENABLE(joystick, - [ --enable-joystick joystick control (default enabled)]) -if test "${enable_joystick}" = "yes"; then - AC_CHECK_HEADER(linux/joystick.h, [VLC_ADD_PLUGINS([joystick])]) -fi dnl dnl corba (ORBit) plugin @@ -4664,6 +4780,34 @@ AS_IF([test "${MOZILLA_CONFIG}"], [ fi ]) AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) +if test "${mozilla}" != "false" +then + build_pic=yes +fi + +dnl +dnl Python bindings +dnl +AC_ARG_ENABLE(python-bindings, + [ --enable-python-bindings Enable Python bindings (default disabled)]) +dnl TODO: look for python dev headers +AM_CONDITIONAL( BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"] ) +if test "${enable_python_bindings}" = "yes" +then + build_pic=yes +fi + +dnl +dnl Java bindings +dnl +AC_ARG_ENABLE(java-bindings, + [ --enable-java-bindings Enable Java bindings (default disabled)]) +AM_CONDITIONAL( BUILD_JAVA, [test "${enable_java_bindings}" = "yes"] ) +if test "${enable_java_bindings}" = "yes" +then + build_pic=yes +fi + dnl dnl test plugins @@ -4777,20 +4921,18 @@ then fi] AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) -AC_ARG_ENABLE(shared-libvlc, - [ --enable-shared-libvlc shared libvlc (default disabled EXPERIMENTAL)], - ,[shared_libvlc=no]) - +dnl +dnl Pic and shared libvlc stuff +dnl 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"], [ AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.]) ]) pic=no -AS_IF([test "${shared_libvlc}" != "no"], [pic=pic]) -AS_IF([${mozilla}], [pic=pic]) +AS_IF([test "${shared_libvlc}" != "no" -o "${build_pic}" = "yes"], [pic=pic]) AS_IF([test "${SYS}" = "mingw32"], [pic=no]) - AS_IF([test "${pic}" = "no"], [pic=]) AC_SUBST(pic) @@ -4875,6 +5017,9 @@ AC_CONFIG_FILES([ Makefile activex/Makefile activex/axvlc.inf + bindings/Makefile + bindings/java/Makefile + bindings/python/Makefile debian/Makefile doc/Makefile intl/Makefile @@ -4970,6 +5115,12 @@ dnl for a in `./vlc-config --target builtin` ; do echo $a; done | sed -e 's,modu dnl echo "Enabled plugin modules :" dnl for a in `./vlc-config --target plugin` ; do echo $a; done | sed -e 's,modules\/\(.*\)\/lib\(.*\)_plugin,\2 (\1),' +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 +chmod a+x compile + printf " vlc configuration -------------------- @@ -4986,6 +5137,6 @@ echo " vlc aliases :${ALIASES} You can tune the compiler flags in vlc-config. -To build vlc and its plugins, type \`make'. +To build vlc and its plugins, type \`./compile' or \`make'. "