vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Apr 3 23:59:50 2011 +0200| [6baecccb8240e2ed8b9d1ddbfaeb9fa9ae191dec] | committer: Felix Paul Kühne
configure.ac: allowing overwriting of the SDK version when using macosx-defaults > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6baecccb8240e2ed8b9d1ddbfaeb9fa9ae191dec --- configure.ac | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index fb64c18..7d95828 100644 --- a/configure.ac +++ b/configure.ac @@ -238,10 +238,6 @@ case "${host_os}" in then echo "" echo "Building with Mac OS X defaults:" - with_macosx_version_min="10.5" - echo " Assuming --with-macosx-version-min=10.5" - with_macosx_sdk="/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" - echo " Assuming --with-macosx-sdk=/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" build_dir=`pwd` echo " Assuming --prefix=${build_dir}/vlc_install_dir" ac_default_prefix="${build_dir}/vlc_install_dir" @@ -282,6 +278,15 @@ case "${host_os}" in CXX="${CXX} -isysroot ${with_macosx_sdk}" OBJC="${OBJC} -isysroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}" + else + echo " No desired SDK version given, falling back to 10.5" + CPP="${CPP} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + CC="${CC} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.5.sdk" + with_macosx_version_min="10.5" + echo " Assuming --with-macosx-version-min=10.5" fi AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) @@ -3733,7 +3738,6 @@ AC_ARG_ENABLE(macosx-vlc-app, AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" && (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ]) - dnl dnl ncurses module dnl _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
