X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=fd9b7d83c80c5b18d6d333e5f8b498787aad704f;hb=b48f3decc61a3e3156a281ca14a331a70aeaeb7d;hp=bf610543d5c233851b5cc95cd32acb28eff611bc;hpb=9f0e70d2fbef825313b619ee2d49a6651ea9aa43;p=vlc diff --git a/configure.ac b/configure.ac index bf610543d5..fd9b7d83c8 100644 --- a/configure.ac +++ b/configure.ac @@ -169,10 +169,57 @@ case "${host_os}" in 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 -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}" - VLC_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation]) - VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation]) + VLC_ADD_LDFLAGS([mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) - VLC_ADD_LDFLAGS([vlc],[-undefined dynamic_lookup]) + VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup]) + VLC_ADD_LDFLAGS([libvlc_control],[-Wl,dynamic_lookup]) + VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx],[-Wl,-read_only_relocs,suppress]) + VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) + VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,Cocoa,-framework,CoreFoundation]) + VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation]) + AC_ARG_ENABLE(macosx-defaults, + [ --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)]) + 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, :) @@ -282,7 +329,10 @@ 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 @@ -291,12 +341,15 @@ dnl AC_ARG_WITH(macosx-sdk, [ --with-macosx-sdk compile with the Mac OS X 10.4u SDK],[], with_macosx_sdk=no) if test "${with_macosx_sdk}" != "no" ; 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 + 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 @@ -321,7 +374,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 @@ -421,7 +473,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)]) @@ -861,8 +913,8 @@ then VLC_ADD_LDFLAGS([screensaver libvlc],[$DBUS_LIBS]) VLC_ADD_CFLAGS([screensaver libvlc],[$DBUS_CFLAGS]) dnl Check for dbus control interface - AC_ARG_ENABLE(dbus-control, [ --enable-dbus-control D-BUS control interface (default disabled)]) - if test "${enable_dbus_control}" = "yes" + AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)]) + if test "${enable_dbus_control}" != "no" then VLC_ADD_PLUGINS([dbus]) VLC_ADD_LDFLAGS([dbus],[$DBUS_LIBS]) @@ -1015,8 +1067,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 @@ -1165,7 +1217,7 @@ 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 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([cvdsub svcdsub spudec 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]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) @@ -1215,36 +1267,22 @@ else fi if test "${SYS}" = "darwin"; then VLC_ADD_PLUGINS([quartztext]) - VLC_ADD_LDFLAGS([quartztext],[-framework Carbon -framework ApplicationServices]) + VLC_ADD_LDFLAGS([quartztext],[-Wl,-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_rgb_sse2 i420_yuy2_sse2" ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec" #ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec" -if test "${enable_gprof}" != "yes" -a "${enable_debug}" != "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) @@ -1270,6 +1308,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.) + 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}" @@ -1300,6 +1373,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], @@ -1394,12 +1477,12 @@ AS_IF( test "${enable_altivec}" != "no", AC_CACHE_CHECK([if linker needs -framework vecLib], [ac_cv_ld_altivec], - [LDFLAGS="${LDFLAGS_vlc} -framework vecLib" + [LDFLAGS="${LDFLAGS_vlc} -Wl,-framework,vecLib" AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no) LDFLAGS="${LDFLAGS_save}" ]) if test "${ac_cv_ld_altivec}" != "no"; then - VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) + VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib]) fi fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -1452,6 +1535,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 @@ -1534,7 +1622,7 @@ then fi AC_ARG_ENABLE(switcher, - [ --enable-switcher Stream-out switcher plugin (default disabled)]) + [ --enable-switcher Stream-out switcher plugin (default disabled)]) dnl Check for libshout AC_ARG_ENABLE(shout, @@ -1573,7 +1661,7 @@ then [ have_lua=no AC_MSG_WARN([lua >= 5.1 not found!]) ]) - ]) + ) ) ]) ]) @@ -2433,7 +2521,7 @@ then if test "${SYS}" = "darwin" then VLC_ADD_PLUGINS([vcd cdda]) - VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-framework IOKit -framework CoreFoundation]) + VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([vcdx cddax cdda],[-liconv]) fi @@ -2484,7 +2572,7 @@ if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ VLC_ADD_PLUGINS([screen]) - VLC_ADD_LDFLAGS([screen],[-framework ApplicationServices]) + VLC_ADD_LDFLAGS([screen],[-Wl,-framework,ApplicationServices]) ]) elif test "${SYS}" = "mingw32"; then VLC_ADD_PLUGINS([screen]) @@ -3003,7 +3091,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 ],[ @@ -3200,7 +3289,7 @@ then else AC_CHECK_HEADERS(QuickTime/QuickTime.h, [ VLC_ADD_BUILTINS([quicktime]) - VLC_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon]) + VLC_ADD_LDFLAGS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ]) fi fi @@ -3238,7 +3327,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, [ @@ -3246,7 +3335,6 @@ AS_IF([test "${enable_libtar}" != "no"],[ ] ) ]) - dnl dnl A52/AC3 decoder plugin dnl @@ -3694,6 +3782,38 @@ if test "${enable_x264}" != "no"; then fi fi +dnl +dnl Teletext Modules +dnl vbi decoder plugin (using libzbvi) +dnl telx module +dnl uncompatible +dnl +AC_ARG_ENABLE(zvbi, + [ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)]) +AC_ARG_ENABLE(telx, + [ --enable-telx, Teletext decoding module (conflicting with zvbi) (default disabled)]) + +AS_IF( [test "${enable_zvbi}" != "no"],[ + AS_IF( [test "${enable_telx}" = "yes"],[ + AC_MSG_ERROR([The zvbi and telx modules are uncompatibles. Disable the other if you enable one.]) + ],[ + PKG_CHECK_MODULES(ZVBI, + zvbi-0.2 >= 0.2.25, + [ + VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS]) + VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) + VLC_ADD_PLUGINS([zvbi]) + AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) + ],[ + AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) + enable_telx="yes" + ]) + ]) + ]) +AS_IF( [test "${enable_telx}" = "yes"],[ + VLC_ADD_PLUGINS([telx]) + ]) + dnl dnl CMML plugin dnl @@ -3914,7 +4034,7 @@ if test "${enable_opengl}" != "no" && else dnl OS X special case (no GL/gl.h but OpenGL/gl.h) VLC_ADD_PLUGINS([opengl]) - VLC_ADD_LDFLAGS([opengl],[-framework OpenGL]) + VLC_ADD_LDFLAGS([opengl],[-Wl,-framework,OpenGL]) fi fi @@ -4038,7 +4158,7 @@ then [VLC_ADD_CFLAGS([freetype],[-DHAVE_FONTCONFIG]) VLC_ADD_LDFLAGS([freetype],[-lfontconfig])]) AC_CHECK_HEADERS(Carbon/Carbon.h, - [VLC_ADD_LDFLAGS([freetype],[-framework Carbon])]) + [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) elif test "${enable_freetype}" = "yes" then AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2 @@ -4543,7 +4663,7 @@ if test "${enable_macosx-audio}" != "no" && then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_BUILTINS([auhal]) - VLC_ADD_LDFLAGS([auhal],[-framework CoreAudio -framework AudioUnit -framework AudioToolbox]) + VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -4720,7 +4840,7 @@ if test "${enable_skins2}" = "yes" || ALIASES="${ALIASES} svlc" VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LDFLAGS([skins2],[-framework Carbon]) + VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon]) else if test "${skins2_missing_lib}" = "no"; then VLC_ADD_PLUGINS([skins2]) @@ -4896,9 +5016,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: @@ -5127,17 +5247,17 @@ AC_ARG_ENABLE(macosx, [if test "${enable_macosx}" = "yes" then VLC_ADD_PLUGINS([access_eyetv]) - VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation]) - VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit]) + VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) + VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, - VLC_ADD_PLUGINS([access_eyetv]) - VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation]) + [VLC_ADD_PLUGINS([access_eyetv]) + VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) VLC_ADD_BUILTINS([macosx]) - VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit]) - VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) - )]) + VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) + VLC_ADD_OBJCFLAGS([macosx],[-fobjc-exceptions]) + ])]) CFLAGS=$ORIGCFLAGS dnl @@ -5325,13 +5445,21 @@ AS_IF([test "${enable_gnutls}" != "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}" +dnl +dnl libgcrypt +dnl +AC_ARG_ENABLE(libgcrypt, + [ --enable-libgcrypt libgcrypts support (default enabled)]) +if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"i 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") + 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 fi AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])