X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac.in;h=ce208b7cc26693909436ed00bc1950035ab95bd5;hb=5927421c930e3a244642c851240a4aa05800354e;hp=8415710b7c112cb3c980ad57e37af6c9dd3b96e1;hpb=7af58f039fb38a61572b4e0d6ebd519d1d44c273;p=vlc diff --git a/configure.ac.in b/configure.ac.in index 8415710b7c..ce208b7cc2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -154,7 +154,11 @@ case "x${target_os}" in LDFLAGS_vlc="${LDFLAGS_vlc} -lbe" LDFLAGS_plugins="${LDFLAGS_plugins} -nostart" LDFLAGS_beos="${LDFLAGS_beos} -lbe -lmedia -lroot -ltracker -lstdc++.r4 -ltranslation" - LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind" + dnl BONE or not BONE ? + AC_CHECK_LIB( bind, inet_ntoa, + [ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lbind" + LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"], + []) ;; x*) SYS="${target_os}" @@ -283,7 +287,21 @@ if ${have_nanosleep}; then AC_DEFINE(HAVE_NANOSLEEP, 1, Define if nanosleep is available.) fi -# HP/UX port + +dnl Check for socklen_t +AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, + [AC_TRY_COMPILE( + [#include + #include ], + [socklen_t len = 42; return len;], + ac_cv_type_socklen_t=yes, + ac_cv_type_socklen_t=no)]) +if test x$ac_cv_type_socklen_t != xno; then + AC_DEFINE(HAVE_SOCKLEN_T, 1, + Define if defines socklen_t.) +fi + +dnl HP/UX port AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"]) AC_CHECK_FUNC(inet_aton,,[ @@ -427,25 +445,89 @@ if test "x${ac_cv_c_inline_limit}" != "xno"; then OBJCFLAGS_save="${OBJCFLAGS_save} -finline-limit-30000"; OBJCFLAGS="${OBJCFLAGS_save}" fi -dnl Check for -W or -w flags -AC_CACHE_CHECK([if \$CC accepts -Wall -Winline], - [ac_cv_c_Wall_Winline], - [CFLAGS="-Wall -Winline ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)]) -if test "x${ac_cv_c_Wall_Winline}" != "xno"; then - CFLAGS_save="-Wall -Winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="-Wall ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="-Wall -Winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" -else - AC_CACHE_CHECK([if \$CC accepts -wall -winline], - [ac_cv_c_wall_winline], - [CFLAGS="-wall -winline ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_wall_winline=yes, ac_cv_c_wall_winline=no)]) - if test "x${ac_cv_c_wall_winline}" != "xno"; then - CFLAGS_save="-wall -winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="-wall -winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="-wall -winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" - fi +# XXX: do this with an M4 macro? +#dnl Check for various -W flags +#for flag in "" all unreachable-code conversion sign-compare disabled-optimization +#do +# AC_CACHE_CHECK([if \$CC accepts -W${flag}], +# [ac_cv_c_W${flag}], +# [CFLAGS="-W${flag} ${CFLAGS_save}" +# AC_TRY_COMPILE([],,ac_cv_c_W${flag}=yes, ac_cv_c_W${flag}=no)]) +# if test "x${ac_cv_c_W${flag}}" != "xno"; then +# CFLAGS_save="-W${flag} ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" +# CXXFLAGS_save="-W${flag} ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" +# OBJCFLAGS_save="-W${flag} ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" +# fi +#done + +AC_CACHE_CHECK([if \$CC accepts -W], + [ac_cv_c_W], + [CFLAGS="-W ${CFLAGS_save}" + AC_TRY_COMPILE([],,ac_cv_c_W=yes, ac_cv_c_W=no)]) +if test "x${ac_cv_c_W}" != "xno"; then + CFLAGS_save="-W ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="-W ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="-W ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" +fi + +AC_CACHE_CHECK([if \$CC accepts -Wall], + [ac_cv_c_Wall], + [CFLAGS="-Wall ${CFLAGS_save}" + AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)]) +if test "x${ac_cv_c_Wall}" != "xno"; then + CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" +fi + +AC_CACHE_CHECK([if \$CC accepts -Wunreachable-code], + [ac_cv_c_Wunreachable_code], + [CFLAGS="-Wunreachable-code ${CFLAGS_save}" + AC_TRY_COMPILE([],,ac_cv_c_Wunreachable_code=yes, ac_cv_c_Wunreachable_code=no)]) +if test "x${ac_cv_c_Wunreachable_code}" != "xno"; then + CFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="-Wunreachable-code ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" +fi + +AC_CACHE_CHECK([if \$CC accepts -Wconversion], + [ac_cv_c_Wconversion], + [CFLAGS="-Wconversion ${CFLAGS_save}" + AC_TRY_COMPILE([],,ac_cv_c_Wconversion=yes, ac_cv_c_Wconversion=no)]) +if test "x${ac_cv_c_Wconversion}" != "xno"; then + CFLAGS_save="-Wconversion ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="-Wconversion ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="-Wconversion ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" +fi + +AC_CACHE_CHECK([if \$CC accepts -Wsign-compare], + [ac_cv_c_Wsign_compare], + [CFLAGS="-Wsign-compare ${CFLAGS_save}" + AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)]) +if test "x${ac_cv_c_Wsign_compare}" != "xno"; then + CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" +fi + +AC_CACHE_CHECK([if \$CC accepts -Wdisabled-optimization], + [ac_cv_c_Wdisabled_optimization], + [CFLAGS="-Wdisabled-optimization ${CFLAGS_save}" + AC_TRY_COMPILE([],,ac_cv_c_Wdisabled_optimization=yes, ac_cv_c_Wdisabled_optimization=no)]) +if test "x${ac_cv_c_Wdisabled_optimization}" != "xno"; then + CFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="-Wdisabled-optimization ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" +fi + +dnl Check for the -Winline flag +AC_CACHE_CHECK([if \$CC accepts -W -Winline], + [ac_cv_c_Winline], + [CFLAGS="-Winline ${CFLAGS_save}" + AC_TRY_COMPILE([],,ac_cv_c_Winline=yes, ac_cv_c_Winline=no)]) +if test "x${ac_cv_c_Winline}" != "xno"; then + CFLAGS_save="-Winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" + OBJCFLAGS_save="-Winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" fi dnl Check for -pipe @@ -606,12 +688,8 @@ PLUGINS="${PLUGINS} aout_file" #PLUGINS="${PLUGINS} scope" PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga" PLUGINS="${PLUGINS} id3 m3u" -PLUGINS="${PLUGINS} wav araw demuxdump demuxsub" - -dnl -dnl Network modules -dnl -NETWORK_MODULES="access_udp access_http access_rtp ipv4 access_mms" +PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm" +PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap" dnl dnl Accelerated modules @@ -622,11 +700,6 @@ THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn" SSE_MODULES="imdctsse downmixsse" ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec" -if test x${SYS} != xbeos -then - PLUGINS="${PLUGINS} ${NETWORK_MODULES}" -fi - AC_CACHE_CHECK([if \$CC groks MMX inline assembly], [ac_cv_mmx_inline], [CFLAGS="${CFLAGS_save}" @@ -863,47 +936,65 @@ then fi dnl -dnl dvdread module: check for libdvdread plugin +dnl dvdread module: check for libdvdread dnl AC_ARG_ENABLE(dvdread, [ --enable-dvdread dvdread input module (default disabled)]) if test "x${enable_dvdread}" != "xno" then AC_ARG_WITH(dvdread, - [ --with-dvdread=PATH libdvdread headers and libraries]) - if test "x${with_dvdread}" = "x" + [ --with-dvdread=PATH libdvdread headers and libraries]) + AC_ARG_WITH(dvdread-tree, + [ --with-dvdread-tree=PATH libdvdread tree for static linking]) + if test "x${with_dvdread}" = x then - LDFLAGS_test="" - CPPFLAGS_test="" - else - LDFLAGS_test="-L${with_dvdread}/lib" - CPPFLAGS_test="-I${with_dvdread}/include" - fi - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" - AC_CHECK_HEADERS(dvdread/dvd_reader.h, [ - AC_TRY_COMPILE([#include ], - [int foo() { return DVD_VIDEO_LB_LEN; }],[ - PLUGINS="${PLUGINS} dvdread" - LDFLAGS_dvdread="${LDFLAGS_dvdread} ${LDFLAGS_test} -ldvdread ${LDFLAGS_dvdcss}" - CPPFLAGS_dvdread="${CPPFLAGS_dvdread} ${CPPFLAGS_test}" - ],[ - if test "x${enable_dvdread}" != "x" - then - AC_MSG_ERROR([Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later]) - fi - ]) - ],[ - if test "x${enable_dvdread}" != "x" + if test "x${with_dvdread_tree}" = x then - if test "x${with_dvdread}" != "x" + AC_CHECK_HEADERS(dvdread/dvdread.h, + [ PLUGINS="${PLUGINS} dvdread" + LDFLAGS_dvdread="${LDFLAGS_dvdread} -ldvdread" ], + [ if test "x${enable_dvdread}" != "x" + then + AC_MSG_WARN([Please get libdvdread from http://www.dtek.chalmers.se/groups/dvd/downloads.shtml]) + AC_MSG_ERROR([cannot find libdvdread headers]) + fi ]) + else + AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) + real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" + if test "x${real_dvdread_tree}" = "x" then - AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h in ${with_dvdread}/include]) + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_dvdread_tree}]) + fi + if test -f "${real_dvdread_tree}/dvdread/.libs/libdvdread.a" + then + dnl Use a custom libdvdread + AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) + BUILTINS="${BUILTINS} dvdread" + LDFLAGS_dvdread="${LDFLAGS_dvdread} ${real_dvdread_tree}/dvdread/.libs/libdvdread.a" + CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${real_dvdread_tree}" else - AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h]) + dnl The given libdvdread wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}]) fi fi - ]) - CPPFLAGS="${CPPFLAGS_save}" + else + AC_MSG_CHECKING(for dvdread headers in ${with_dvdread}) + if test -f ${with_dvdread}/include/dvdread/dvdread.h + then + dnl Use ${with_dvdread}/include/dvdread/dvdread.h + AC_MSG_RESULT(yes) + PLUGINS="${PLUGINS} dvdread" + LDFLAGS_dvdread="${LDFLAGS_dvdread} -L${with_dvdread}/lib -ldvdread" + CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${with_dvdread}/include" + else + dnl No libdvdread could be found, sorry + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvdread.h]) + fi + fi fi dnl @@ -914,40 +1005,66 @@ AC_ARG_ENABLE(dvdplay, if test "x${enable_dvdplay}" != "xno" then AC_ARG_WITH(dvdplay, - [ --with-dvdplay=PATH libdvdplay headers and libraries]) + [ --with-dvdplay=PATH libdvdplay headers and libraries]) + AC_ARG_WITH(dvdplay-tree, + [ --with-dvdplay-tree=PATH libdvdplay tree for static linking]) if test "x${with_dvdplay}" = x then - LDFLAGS_test="" - CPPFLAGS_test="" - else - LDFLAGS_test="-L${with_dvdplay}/lib" - CPPFLAGS_test="-I${with_dvdplay}/include" - fi - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" - AC_CHECK_HEADERS(dvdplay/dvdplay.h, [ - PLUGINS="${PLUGINS} dvdplay" - LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${LDFLAGS_test} -ldvdplay -ldvdread ${LDFLAGS_dvdcss}" - CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_test}" - ],[ - if test "x${enable_dvdplay}" != x + if test "x${with_dvdplay_tree}" = x then - if test "x${with_dvdplay}" != x + AC_CHECK_HEADERS(dvdplay/dvdplay.h, + [ PLUGINS="${PLUGINS} dvdplay" + LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${LDFLAGS_dvd} ${LDFLAGS_dvdread} -ldvdplay" + CPPFLAGS_dvdplay = "${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread}" ], + [ if test "x${enable_dvdplay}" != "x" + then + AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.]) + AC_MSG_ERROR([cannot find libdvdplay headers]) + fi ]) + else + AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree}) + real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`" + if test "x${real_dvdplay_tree}" = "x" then - AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h in ${with_dvdplay}/include]) + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_dvdplay_tree}]) + fi + if test -f "${real_dvdplay_tree}/src/.libs/libdvdplay.a" + then + dnl Use a custom libdvdplay + AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a) + BUILTINS="${BUILTINS} dvdplay" + LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${LDFLAGS_dvd} ${LDFLAGS_dvdread} ${real_dvdplay_tree}/src/.libs/libdvdplay.a" + CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src" else - AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h]) + dnl The given libdvdplay wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_dvdplay_tree}/src/.libs/libdvdplay.a, make sure you compiled libdvdplay in ${with_dvdplay_tree}]) fi fi - ]) - CPPFLAGS="${CPPFLAGS_save}" + else + AC_MSG_CHECKING(for dvdplay headers in ${with_dvdplay}) + if test -f ${with_dvdplay}/include/dvdplay/dvdplay.h + then + dnl Use ${with_dvdplay}/include/dvdplay/dvdplay.h + AC_MSG_RESULT(yes) + PLUGINS="${PLUGINS} dvdplay" + LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${LDFLAGS_dvd} ${LDFLAGS_dvdread} -L${with_dvdplay}/lib -ldvdplay" + CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${with_dvdplay}/include" + else + dnl No libdvdplay could be found, sorry + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${with_dvdplay}/include/dvdplay/dvdplay.h]) + fi + fi fi - dnl dnl libdvbpsi ts demux dnl AC_ARG_ENABLE(dvbpsi, -[ --enable-dvbpsi dvbpsi ts demux module (default disabled)]) +[ --enable-dvbpsi dvbpsi ts demux module (default enabled)]) if test "x${enable_dvbpsi}" != "xno" then AC_ARG_WITH(dvbpsi, @@ -961,7 +1078,7 @@ then AC_CHECK_HEADERS(dvbpsi/dr.h, [ PLUGINS="${PLUGINS} ts_dvbpsi" LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" ], - [ AC_MSG_ERROR([cannot find libdvbpsi headers]) ], + [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [#include #include #include @@ -1043,6 +1160,11 @@ then PLUGINS="${PLUGINS} vcd" ]) + AC_EGREP_HEADER(scsireq,sys/scsiio.h,[ + PLUGINS="${PLUGINS} vcd" + AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support) + ]) + AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[ PLUGINS="${PLUGINS} vcd" AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support) @@ -1557,7 +1679,7 @@ then AC_CHECK_HEADERS(theora/theora.h, [ AC_CHECK_LIB(theora, theora_granule_time, [ BUILTINS="${BUILTINS} theora" - LDFLAGS_theora="${LDFLAGS_theora} -logg -ltheora" ],[ + LDFLAGS_theora="${LDFLAGS_theora} -ltheora -logg" ],[ AC_MSG_ERROR([libtheora doesn't appear to be installed on you system. You also need to check that you have a libogg posterior to the 1.0 release.])], [-logg]) @@ -2079,10 +2201,10 @@ then fi CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cflags`" LDFLAGS_wxwindows="${LDFLAGS_wxwindows} `${WX_CONFIG} --libs`" - # now look for the wx.h header + # now look for the wxprec.h header CPPFLAGS="${save_CPPFLAGS} ${CXXFLAGS_wxwindows}" ac_cv_wx_headers=yes - AC_CHECK_HEADERS(wx/wx.h, , [ + AC_CHECK_HEADERS(wx/wxprec.h, , [ ac_cv_wx_headers=no echo "Cannot find wxWindows development headers." ]) @@ -2168,11 +2290,11 @@ AC_ARG_ENABLE(macosx, [if test "x${enable_macosx}" = "xyes" then BUILTINS="${BUILTINS} macosx" - LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework AGL -framework QuickTime -lobjc -ObjC" + LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC" fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, BUILTINS="${BUILTINS} macosx" - LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework AGL -framework QuickTime -lobjc -ObjC" + LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC" )]) dnl