From bf175c5fb007f2e64e95c5ec6d2cf6365b7b6077 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 4 Jul 2013 06:52:31 -0600
Subject: [PATCH] configure: add --enable-sdk6

To ensure that the Mac OS X 64-bit builds work on 10.6.
---
 racket/src/configure           | 20 +++++++++++++++++++-
 racket/src/racket/configure.ac | 15 ++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/racket/src/configure b/racket/src/configure
index 19c021a4cb..61b956b56e 100755
--- a/racket/src/configure
+++ b/racket/src/configure
@@ -1358,6 +1358,7 @@ Optional Features:
   --enable-lt=<prog>      use <prog> instead of libtool; disable to use bundled
   --enable-libffi         use installed libffi (enabled by default for Unix)
   --enable-sdk=<path>     use Mac OS X 10.4 SDK directory
+  --enable-sdk6=<path>    use Mac OS X 10.6 SDK directory
   --enable-xonx           use Unix style (e.g., use Gtk) for Mac OS X
   --enable-libfw          install Mac OS X frameworks to /Library/Frameworks
   --enable-userfw         install Mac OS X frameworks to ~/Library/Frameworks
@@ -2075,6 +2076,11 @@ else
 fi
 
 
+# Check whether --enable-sdk was given.
+if test "${enable_sdk+set}" = set; then
+  enableval=$enable_sdk;
+fi
+
 # Check whether --enable-sdk was given.
 if test "${enable_sdk+set}" = set; then
   enableval=$enable_sdk;
@@ -2399,7 +2405,13 @@ show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system"
 show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user"
 
 if test "${enable_sdk}" != "" ; then
-   echo "=== Using Mac OS X SDK directory ${enable_sdk}"
+   if test "${enable_sdk6}" != "" ; then
+     echo "ERROR: cannot specify both --enable-sdk and --enable-sdk6"
+   fi
+   echo "=== Using Mac OS X 10.4 SDK directory ${enable_sdk}"
+fi
+if test "${enable_sdk6}" != "" ; then
+   echo "=== Using Mac OS X 10.6 SDK directory ${enable_sdk6}"
 fi
 
 if test "${enable_racket}" != "" ; then
@@ -4172,6 +4184,12 @@ _ACEOF
       need_cc_in_extras=yes
     fi
 
+    if test "${enable_sdk6}" != "" ; then
+      PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
+      LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
+    fi
+
     case "$host_cpu" in
       i386|x86_64)
        enable_parallel_by_default=yes
diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac
index 65fbe796ea..6e8d8b8320 100644
--- a/racket/src/racket/configure.ac
+++ b/racket/src/racket/configure.ac
@@ -49,6 +49,7 @@ AC_ARG_ENABLE(lt,      [  --enable-lt=<prog>      use <prog> instead of libtool;
 AC_ARG_ENABLE(libffi,  [  --enable-libffi         use installed libffi (enabled by default for Unix)], , enable_libffi=default)
 
 AC_ARG_ENABLE(sdk,     [  --enable-sdk=<path>     use Mac OS X 10.4 SDK directory])
+AC_ARG_ENABLE(sdk,     [  --enable-sdk6=<path>    use Mac OS X 10.6 SDK directory])
 AC_ARG_ENABLE(xonx,    [  --enable-xonx           use Unix style (e.g., use Gtk) for Mac OS X])
 AC_ARG_ENABLE(libfw,   [  --enable-libfw          install Mac OS X frameworks to /Library/Frameworks])
 AC_ARG_ENABLE(libfw,   [  --enable-userfw         install Mac OS X frameworks to ~/Library/Frameworks])
@@ -302,7 +303,13 @@ show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system"
 show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user"
 
 if test "${enable_sdk}" != "" ; then
-   echo "=== Using Mac OS X SDK directory ${enable_sdk}"
+   if test "${enable_sdk6}" != "" ; then
+     echo "ERROR: cannot specify both --enable-sdk and --enable-sdk6"
+   fi
+   echo "=== Using Mac OS X 10.4 SDK directory ${enable_sdk}"
+fi
+if test "${enable_sdk6}" != "" ; then
+   echo "=== Using Mac OS X 10.6 SDK directory ${enable_sdk6}"
 fi
 
 if test "${enable_racket}" != "" ; then
@@ -672,6 +679,12 @@ case "$host_os" in
       need_cc_in_extras=yes
     fi
     
+    if test "${enable_sdk6}" != "" ; then 
+      PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
+      LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
+    fi
+    
     case "$host_cpu" in
       i386|x86_64)
        enable_parallel_by_default=yes