X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=727b9ed104def21197da244f18039a0a2ed8891f;hb=3b7381f3bd51b349b8ba53c729ff83529c9ab13f;hp=5eef18e7e1d18682a281fc8cd962c77b3ec692b0;hpb=d998d106fcc1135751f1139598c4251cd6f8cd98;p=vlc diff --git a/configure.ac b/configure.ac index 5eef18e7e1..727b9ed104 100644 --- a/configure.ac +++ b/configure.ac @@ -164,17 +164,6 @@ case "${host_os}" in ;; esac ;; - 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}" - OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}" - VLC_ADD_LDFLAGS([libvlc ffmpeg ffmpegaltivec],[-all_load]) - VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation]) - VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) - VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-m -Wl,-multiply_defined -Wl,suppress]) - ;; darwin*) SYS=darwin CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" @@ -184,6 +173,48 @@ case "${host_os}" in VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation]) VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) VLC_ADD_LDFLAGS([vlc],[-undefined dynamic_lookup]) + AC_ARG_ENABLE(macosx-defaults, + [ --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)]) + if test "x${enable_macosx_defaults}" != "xno" + then + echo "" + echo "Building with Mac OS X defaults:" + enable_faad="yes" + echo " Assuming --enable-faad" + enable_flac="yes" + echo " Assuming --enable-flac" + enable_theora="yes" + echo " Assuming --enable-theora" + enable_shout="yes" + echo " Assuming --enable-shout" + enable_cddax="yes" + echo " Assuming --enable-cddax" + enable_vcdx="yes" + echo " Assuming --enable-vcdx" + enable_caca="yes" + echo " Assuming --enable-caca" + enable_goom="yes" + echo " Assuming --enable-goom" + enable_ncurses="yes" + echo " Assuming --enable-ncurses" + enable_twolame="yes" + echo " Assuming --enable-twolame" + enable_realrtsp="yes" + echo " Assuming --enable-realrtsp" + + enable_skins2="no" + echo " Assuming --disable-skins2" + enable_x11="no" + echo " Assuming --disable-x11" + enable_glx="no" + echo " Assuming --disable-glx" + enable_xvideo="no" + echo " Assuming --disable-xvideo" + + enable_libtool="no" + echo " Assuming --disable-libtool" + echo "" + fi ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) @@ -210,7 +241,8 @@ case "${host_os}" in if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" - VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) + VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm]) + VLC_ADD_LDFLAGS([vlc activex mozilla],[-mwindows]) VLC_ADD_LDFLAGS([cdda vcdx cddax],[-lwinmm]) VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync growl flac ts audioscrobbler],[-lws2_32]) fi @@ -267,6 +299,18 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") dnl +dnl Sadly autoconf doesn't think about testing foo.exe when ask to test +dnl for program foo on win32 + +case "${build_os}" in + cygwin|msys) + ac_executable_extensions=".exe" + ;; + *) + ;; +esac + +dnl dnl Libtool dnl It's very bad, but our former custom system was worst dnl -- Courmisch @@ -280,36 +324,33 @@ AC_PROG_LIBTOOL AC_ARG_ENABLE(libtool, [ --enable-libtool use libtool (default enabled)]) -AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"]) +AS_IF([test "x{enable_libtool}" = "xno"], [ + AC_MSG_WARN([Disabling libtool is strongly discouraged. There are known bugs.]) +]) +AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"] ) 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) + [ --with-macosx-sdk compile with the Mac OS X 10.4u SDK],[], with_macosx_sdk=no) if test "${with_macosx_sdk}" != "no" ; then - if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then - CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}" - LDFLAGS_save="${LDFLAGS_save} -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"; LDFLAGS="${LDFLAGS_save}" - export MACOSX_DEPLOYMENT_TARGET=10.4 - MACOSX_DEPLOYMENT_TARGET="10.4" - elif test "${host_cpu}" = "powerpc"; then - CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -mmacosx-version-min=10.3"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -mmacosx-version-min=10.3"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -mmacosx-version-min=10.3"; 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 + CC="${CC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.4u.sdk" + CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}" + MACOSX_DEPLOYMENT_TARGET="10.4" + export MACOSX_DEPLOYMENT_TARGET fi dnl dnl Gettext stuff dnl -ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fr fur gl he hi hu it ja ka ko lt lv ms my ne nl no oc pa pl ps pt_BR pt_PT ro ru sk sl sq sv tet th tl tr zh_CN zh_TW" +ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fa fr fur gl he hi hu it ja ka ko lt lv ms my ne nl no oc pa pl ps pt_BR pt_PT ro ru sk sl sq sv tet th tl tr zh_CN zh_TW" AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ @@ -328,7 +369,6 @@ AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ ]) ]) AC_SUBST(INCLUDED_LIBINTL) -XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS" dnl dnl Iconv stuff @@ -428,7 +468,7 @@ need_libc=false AC_CHECK_FUNCS(gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy) dnl Check for usual libc functions -AC_CHECK_FUNCS(strdup strndup atof) +AC_CHECK_FUNCS(strdup strndup strnlen atof) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) @@ -584,6 +624,9 @@ AC_CHECK_LIB(m,sqrt,[ AC_CHECK_LIB(m,ceil,[ VLC_ADD_LDFLAGS([mosaic],[-lm]) ]) +AC_CHECK_LIB(m,exp,[ + VLC_ADD_LDFLAGS([gaussianblur],[-lm]) +]) AC_CHECK_LIB(mx,sqrtf,[ VLC_ADD_LDFLAGS([x264],[-lmx]) ]) @@ -1019,8 +1062,8 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer], AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)]) if test "${ac_cv_c_omit_frame_pointer}" != "no"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" - # this plugin does not compile without -fomit-frame-pointer, damn gcc! - VLC_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer]) + # these plugins do not compile without -fomit-frame-pointer, damn gcc! + VLC_ADD_CFLAGS([i420_yuy2_mmx i420_yuy2_sse2],[-fomit-frame-pointer]) fi dnl Check for -fvisibility=hidden @@ -1168,7 +1211,7 @@ dnl dnl default modules dnl VLC_ADD_PLUGINS([dummy logger memcpy]) -VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flacsys tta]) +VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta]) VLC_ADD_PLUGINS([cvdsub svcdsub spudec telx subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac]) VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise extract sharpen]) VLC_ADD_PLUGINS([converter_fixed mono]) @@ -1179,6 +1222,7 @@ VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify puzzle colorth VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv]) VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp]) VLC_ADD_PLUGINS([access_http access_mms access_ftp]) +VLC_ADD_PLUGINS([access_filter_bandwidth]) VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) VLC_ADD_PLUGINS([packetizer_vc1]) @@ -1187,7 +1231,7 @@ VLC_ADD_PLUGINS([packetizer_vc1]) if test "${SYS}" != "mingwce"; then VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump]) VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf marq podcast shout sap fake folder]) - VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask]) + VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur]) VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga]) VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler]) VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer]) @@ -1216,34 +1260,24 @@ elif test "${SYS}" != "mingwce"; then else VLC_ADD_PLUGINS([win32text]) fi +if test "${SYS}" = "darwin"; then + VLC_ADD_PLUGINS([quartztext]) + VLC_ADD_LDFLAGS([quartztext],[-framework Carbon -framework ApplicationServices]) +fi dnl dnl Accelerated modules dnl -MMX_MODULES="memcpymmx i420_rgb_mmx i422_yuy2_mmx i420_ymga_mmx" +MMX_MODULES="memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx" #MMX_MODULES="${MMX_MODULES} idctmmx motionmmx" MMXEXT_MODULES="memcpymmxext" #MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext" THREEDNOW_MODULES="memcpy3dn" SSE_MODULES="" +SSE2_MODULES="i420_yuy2_sse2" ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec" #ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec" -if test "${enable_gprof}" != "yes" -then - MMX_MODULES="${MMX_MODULES} i420_yuy2_mmx" -fi - -AC_CACHE_CHECK([if \$CC groks MMX inline assembly], - [ac_cv_mmx_inline], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], - ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) -if test "${ac_cv_mmx_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_MMX, 1, Define if \$CC groks MMX inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}" -fi - dnl Check for fully workin MMX intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) @@ -1269,6 +1303,41 @@ if test "${ac_cv_c_mmx_intrinsics}" != "no"; then VLC_ADD_CFLAGS([i420_rgb_mmx],[-mmmx]) fi +dnl Check for fully workin SSE2 intrinsics +dnl We need support for -mmmx, we need , and we also need a +dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) +AC_CACHE_CHECK([if \$CC groks SSE2 intrinsics], + [ac_cv_c_sse2_intrinsics], + [CFLAGS="${CFLAGS_save} -O -msse2" + AC_TRY_COMPILE([#include + #include + uint64_t frobzor;], + [__m128i a, b, c; + a = b = c = _mm_set1_epi64((__m64)frobzor); + a = _mm_slli_epi16(a, 3); + a = _mm_adds_epi16(a, b); + c = _mm_srli_epi16(c, 8); + c = _mm_slli_epi16(c, 3); + b = _mm_adds_epi16(b, c); + a = _mm_unpacklo_epi8(a, b); + frobzor = (uint64_t)_mm_movepi64_pi64(a);], + [ac_cv_c_sse2_intrinsics=yes], + [ac_cv_c_sse2_intrinsics=no])]) +if test "${ac_cv_c_sse2_intrinsics}" != "no"; then + AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, Define if SSE2 intrinsics are available.) + dnl VLC_ADD_CFLAGS([i420_rgb_sse2],[-msse2]) +fi + +AC_CACHE_CHECK([if \$CC groks MMX inline assembly], + [ac_cv_mmx_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], + ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) +if test "${ac_cv_mmx_inline}" != "no"; then + AC_DEFINE(CAN_COMPILE_MMX, 1, Define if \$CC groks MMX inline assembly.) + ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}" +fi + AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly], [ac_cv_mmxext_inline], [CFLAGS="${CFLAGS_save}" @@ -1299,6 +1368,16 @@ if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"; then ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" fi +AC_CACHE_CHECK([if \$CC groks SSE2 inline assembly], + [ac_cv_sse2_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("punpckhqdq %%xmm1,%%xmm2"::"r"(p));], + ac_cv_sse2_inline=yes, ac_cv_sse2_inline=no)]) +if test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"; then + AC_DEFINE(CAN_COMPILE_SSE2, 1, Define if \$CC groks SSE2 inline assembly.) + ACCEL_MODULES="${ACCEL_MODULES} ${SSE2_MODULES}" +fi + if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly], [ac_cv_altivec_inline], @@ -1451,6 +1530,11 @@ then ARCH="${ARCH} mmx" VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi +if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64" +then + ARCH="${ARCH} sse sse2" + VLC_ADD_BUILTINS([${ACCEL_MODULES}]) +fi dnl dnl Memory usage @@ -1488,6 +1572,22 @@ AH_TEMPLATE(NDEBUG, [Define to 1 if debug code should NOT be compiled]) AS_IF([test "x${enable_debug}" = "xno"], [AC_DEFINE(NDEBUG)]) +dnl +dnl Test coverage +dnl +AC_ARG_ENABLE(coverage, + [ --enable-coverage build for test coverage (default disabled)],, + [enable_coverage="no"]) +AS_IF([test "${enable_coverage}" != "no"], [ + CFLAGS="-fprofile-arcs -ftest-coverage ${CFLAGS}" + CXXFLAGS="-fprofile-arcs -ftest-coverage ${CXXFLAGS}" + LDFLAGS="-lgcov ${LDFLAGS}" + dnl ugly... + CFLAGS_save="${CFLAGS}" + CXXFLAGS_save="${CXXFLAGS}" + LDFLAGS_save="${LDFLAGS}" +]) + dnl dnl Enable release-specific flags dnl @@ -1531,6 +1631,43 @@ if test "${enable_shout}" = "yes"; then [AC_MSG_WARN(libshout library not found)]) fi +dnl Lua playlist demux +AC_ARG_ENABLE(luaplaylist, + [ --enable-lua lua playlist demux plugin (default enabled)]) +if test "${enable_lua}" != "no" +then + PKG_CHECK_MODULES(LUA, lua5.1, + [ have_lua=yes ], + [ + AC_MSG_WARN([lua5.1 not found, trying lua >= 5.1 instead]) + PKG_CHECK_MODULES(LUA, lua >= 5.1, + [ have_lua=yes ], + [ + have_lua=yes + AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], + [], + [ have_lua=no ] ) + AC_CHECK_LIB( lua5.1 , luaL_newstate, + [LUA_LIBS="-llua5.1"], + AC_CHECK_LIB( lua51 , luaL_newstate, + [LUA_LIBS="-llua51"], + AC_CHECK_LIB( lua , luaL_newstate, + [LUA_LIBS="-llua"], + [ have_lua=no + AC_MSG_WARN([lua >= 5.1 not found!]) + ]) + ) + ) + ]) + ]) + if test "x${have_lua}" = "xyes" ; then + AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library]) + VLC_ADD_PLUGINS([luaplaylist]) + VLC_ADD_LDFLAGS([luaplaylist],[$LUA_LIBS]) + VLC_ADD_CFLAGS([luaplaylist],[$LUA_CFLAGS]) + fi +fi + dnl dnl HTTP daemon dnl @@ -1987,6 +2124,22 @@ then fi fi +dnl +dnl Windows DirectShow BDA access module +dnl +AC_ARG_ENABLE(bda, + [ --enable-bda Win32 DirectShow BDA support (default enabled on Win32)]) +if test "${enable_bda}" != "no" +then + if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" + then + AC_CHECK_HEADERS(dshow.h, + [ VLC_ADD_PLUGINS([bda]) + VLC_ADD_CXXFLAGS([bda],[]) + VLC_ADD_LDFLAGS([bda],[-lstrmiids -lole32 -loleaut32 -luuid]) ]) + fi +fi + dnl dnl OpenCV wrapper and example filters @@ -2933,7 +3086,8 @@ dnl Trying with pkg-config PKG_CHECK_MODULES(SWSCALE, libswscale,[ VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) VLC_ADD_LDFLAGS([ffmpeg],[${SWSCALE_LIBS}]) - AC_CHECK_HEADERS(ffmpeg/swscale.h) + AC_CHECK_LIB(swscale, sws_getContext, + [AC_CHECK_HEADERS(ffmpeg/swscale.h)],[]) ],[ true ]) VLC_RESTORE_FLAGS ],[ @@ -3168,7 +3322,7 @@ dnl dnl skins2 module dnl AC_ARG_ENABLE(libtar, - [ --enable libtar support for skins2 (default enabled)]) + [ --enable-libtar support for skins2 (default enabled)]) AS_IF([test "${enable_libtar}" != "no"],[ AC_CHECK_HEADERS(libtar.h, [ @@ -4494,16 +4648,18 @@ then fi dnl -dnl JACK module +dnl JACK modules dnl AC_ARG_ENABLE(jack, - [ --enable-jack JACK audio module (default disabled)], - [if test "${enable_jack}" = "yes" - then - AC_CHECK_HEADERS(jack/jack.h, [ - VLC_ADD_PLUGINS([jack]) - VLC_ADD_LDFLAGS([jack],[-ljack]) ]) - fi]) + [ --enable-jack JACK audio I/O modules (default disabled)],, + [enable_jack="no"]) + +AS_IF([test "${enable_jack}" != "no"], [ + AC_CHECK_HEADERS(jack/jack.h, [ + VLC_ADD_PLUGINS([access_jack jack]) + VLC_ADD_LDFLAGS([access_jack jack],[-ljack]) + ],[AC_MSG_ERROR([cannot find JACK headers])]) +]) dnl dnl CyberLink for C++ UPnP stack @@ -4824,9 +4980,9 @@ then AC_PATH_PROG(WX_CONFIG, ${WXWIDGETS_NAME}, no, ${WXWIDGETS_PATH}) if test "${WX_CONFIG}" != "no" -a "${CXX}" != "" then - if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null || expr 2.7.0 \<= `${WX_CONFIG} --version` >/dev/null + if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null then - AC_MSG_ERROR([You need wxWidgets of the 2.6 branch. Please upgrade/downgrade and try again. Better yet, you can configure with --disable-wxwidgets.]) + AC_MSG_ERROR([You need wxWidgets version 2.6.0 or upwards. Please upgrade and try again.]) fi AC_LANG_PUSH(C++) # Turn this error: @@ -4911,9 +5067,10 @@ AS_IF([test "${enable_qt4}" != "no" && enableqt4=true VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS]) VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS]) - MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc - RCC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/rcc - UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic], + 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) + ], AS_IF([test "${enable_qt4}" = "yes"],[ AC_MSG_ERROR(QT4 library not found) ],[ @@ -5252,7 +5409,14 @@ AS_IF([test "${enable_gnutls}" != "no"], [ ]) ]) -AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"]) +dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect +dnl it and looks for libgcrypt headers in the wrong place. +if test "${host_cpu}" = "${build_cpu}" +then + AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"]) +else + AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no") +fi AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"]) @@ -5560,6 +5724,18 @@ fi AC_LANG_POP(C++) AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) +dnl Tests for Osso and Xsp +AC_CHECK_LIB(osso, osso_display_blanking_pause,[ + PKG_CHECK_MODULES(GLIB2, glib-2.0, [ + VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}]) + VLC_ADD_LDFLAGS([x11],[-losso]) + ]) +]) +AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[ + VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP]) + VLC_ADD_LDFLAGS([x11],[-lXsp]) +]) + dnl dnl Mediacontrol Python bindings dnl @@ -5811,6 +5987,7 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ modules/access/Makefile + modules/access/bda/Makefile modules/access/dshow/Makefile modules/access/dvb/Makefile modules/access/mms/Makefile @@ -5869,7 +6046,7 @@ AC_CONFIG_FILES([ modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_output/Makefile - modules/video_output/directx/Makefile + modules/video_output/msw/Makefile modules/video_output/qte/Makefile modules/video_output/x11/Makefile modules/visualization/Makefile