X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=f7ca72067ee9b9673d0b99962f727f97e72f8ae1;hb=4e76ae4774102db3307768e12c9100c6d350b77f;hp=59341836bd4f9527a0305b78edee43795ef25bd4;hpb=298291bb37a79b92ad1fd6502c5006125dcb92c3;p=vlc diff --git a/configure.ac b/configure.ac index 59341836bd..f7ca72067e 100644 --- a/configure.ac +++ b/configure.ac @@ -173,6 +173,8 @@ 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]) + VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) + VLC_ADD_LDFLAGS([motion],[-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" @@ -324,6 +326,9 @@ AC_PROG_LIBTOOL AC_ARG_ENABLE(libtool, [ --enable-libtool use libtool (default enabled)]) +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"] ) @@ -333,12 +338,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 @@ -902,8 +910,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]) @@ -1268,7 +1276,7 @@ MMXEXT_MODULES="memcpymmxext" #MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext" THREEDNOW_MODULES="memcpy3dn" SSE_MODULES="" -SSE2_MODULES="i420_yuy2_sse2" +SSE2_MODULES="i420_rgb_sse2 i420_yuy2_sse2" ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec" #ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec" @@ -1319,7 +1327,7 @@ AC_CACHE_CHECK([if \$CC groks SSE2 intrinsics], [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]) + VLC_ADD_CFLAGS([i420_rgb_sse2],[-msse2]) fi AC_CACHE_CHECK([if \$CC groks MMX inline assembly], @@ -1611,7 +1619,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, @@ -3080,7 +3088,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 ],[ @@ -3315,7 +3324,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, [ @@ -3323,7 +3332,6 @@ AS_IF([test "${enable_libtar}" != "no"],[ ] ) ]) - dnl dnl A52/AC3 decoder plugin dnl @@ -5402,13 +5410,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"])