X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=228342764164c646acfe2937d5e1c7c00f9fa413;hb=c704c4afd46601b4e0333525329f71ebbbb397ba;hp=b16971b3ef1d003ef86c9a34e99dd720007990ed;hpb=b0152eca135b22c048753d7a29a285df71b7c051;p=vlc diff --git a/configure.ac b/configure.ac index b16971b3ef..2283427641 100644 --- a/configure.ac +++ b/configure.ac @@ -215,8 +215,8 @@ case "${host_os}" in enable_xvideo="no" echo " Assuming --disable-xvideo" - with_macosx_sdk="yes" - echo " Assuming --with-macosx-sdk" + with_macosx_sdk="no" + echo " Compiling without SDK usage" fi if test ".`uname -p`" = ".i386"; then dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code @@ -368,12 +368,15 @@ if test "${with_macosx_sdk}" != "no" ; then 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" + 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 +else + MACOSX_DEPLOYMENT_TARGET="10.4" + export MACOSX_DEPLOYMENT_TARGET fi dnl @@ -5586,6 +5589,20 @@ then fi AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"]) +dnl +dnl update checking system +dnl +AC_ARG_ENABLE(update-check, + [ --enable-update-check update checking system (default disabled)]) +if test "${enable_update_check}" = "yes" +then + if test "${have_libgcrypt}" != "yes" + then + AC_MSG_ERROR([libgcrypt is required for update checking system]) + fi + VLC_ADD_LIBS([libvlc], [-lgcrypt]) + AC_DEFINE([UPDATE_CHECK], [1], [Define if you want to use the VLC update mechanism]) +fi dnl dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling @@ -6066,7 +6083,7 @@ AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) dnl New definitions with value matching 0.9.0 release -module_symbol="0_9_0c" +module_symbol="0_9_0d" AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions]) VLC_ENTRY="vlc_entry__${module_symbol}"