contrib: error out early if MacOSX SDK doesn't exist

diff --git a/contrib/bootstrap b/contrib/bootstrap
index b24310f04194fdb33df6a2a8e87d2b97128162ac..e9970075321f824456c9ea0ad8ff9d8a8b52c9cb 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -137,6 +137,20 @@ add_make_enabled()
        done
 }
 
+check_macosx_sdk()
+{
+   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.5" && OSX_VERSION=10.5
+   SDK="/Developer/SDKs/MacOSX${OSX_VERSION}.sdk"
+   if [ ! -d "${SDK}" ]
+   then
+          echo "
+*** ${SDK} does not exist, please install required SDK, or use export OSX_VERSION=10.6 ***
+"
+          exit 1
+   fi
+   add_make "OSX_VERSION ?= ${OSX_VERSION}"
+}
+
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
@@ -147,6 +161,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 OS="${HOST#*-}" # strip architecture
 case "${OS}" in
        apple-darwin*)
+               check_macosx_sdk
                add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                ;;
        *darwin*)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 815f18a19ccabd316304d922a79cbff288bc8a56..7f10e76aad56b03d89e59cacdfe1facc45791b31 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -90,7 +90,6 @@ endif
 endif
 
 ifdef HAVE_MACOSX
-OSX_VERSION?=10.5
 MACOSX_SDK=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk
 CC=gcc-4.2
 CXX=g++-4.2