From 75f679c047cb2a0526edf9e71d474587e71c4980 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 11 Mar 2008 13:39:44 +0000 Subject: [PATCH] add --enable-sdk configure flag svn: r8947 --- src/configure | 16 +++++++++++++++- src/mzscheme/configure.ac | 12 +++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/configure b/src/configure index ccb1bc97c0..0c09434290 100755 --- a/src/configure +++ b/src/configure @@ -1360,6 +1360,7 @@ Optional Features: --enable-gprof compile for profiling with gprof (gcc only) --enable-gcov compile to gather gcov statistics (gcc3 only) --enable-noopt drop -O C flags + --enable-sdk= use Mac OS X SDK directory --enable-xonx compile X11 (not Quartz) MrEd for Mac OS X --enable-libfw install Mac OS X frameworks to /Library/Frameworks --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks @@ -1979,6 +1980,12 @@ if test "${enable_noopt+set}" = set; then fi +# Check whether --enable-noopt was given. +if test "${enable_noopt+set}" = set; then + enableval=$enable_noopt; +fi + + # Check whether --enable-xonx was given. if test "${enable_xonx+set}" = set; then enableval=$enable_xonx; @@ -5841,7 +5848,14 @@ case $OS in ;; Darwin) - PREFLAGS="$PREFLAGS -D_DARWIN_UNLIMITED_SELECT -DOS_X" + if test "${enable_sdk}" != "" ; then + PREFLAGS="$PREFLAGS -I${enable_sdk}/usr/include" + PREFLAGS="$PREFLAGS -F${enable_sdk}/System/Library/Frameworks/" + LDFLAGS="$LDFLAGS -L${enable_sdk}/usr/lib" + LDFLAGS="$LDFLAGS -F${enable_sdk}/System/Library/Frameworks/" + fi + + PREFLAGS="$PREFLAGS -DOS_X -D_DARWIN_UNLIMITED_SELECT" # zlib comes with the OS ZLIB_A="" diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac index f90b2b9800..b0d3c35a46 100644 --- a/src/mzscheme/configure.ac +++ b/src/mzscheme/configure.ac @@ -66,6 +66,8 @@ AC_ARG_ENABLE(gcov, [ --enable-gcov compile to gather gcov statist AC_ARG_ENABLE(noopt, [ --enable-noopt drop -O C flags]) +AC_ARG_ENABLE(noopt, [ --enable-sdk= use Mac OS X SDK directory]) + AC_ARG_ENABLE(xonx, [ --enable-xonx compile X11 (not Quartz) MrEd 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]) @@ -588,11 +590,11 @@ case $OS in ;; Darwin) - if test -d "/Developer/SDKs/MacOSX10.4u.sdk"; then - PREFLAGS="$PREFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/usr/include" - PREFLAGS="$PREFLAGS -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/" - LDFLAGS="$LDFLAGS -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib" - LDFLAGS="$LDFLAGS -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/" + if test "${enable_sdk}" != "" ; then + PREFLAGS="$PREFLAGS -I${enable_sdk}/usr/include" + PREFLAGS="$PREFLAGS -F${enable_sdk}/System/Library/Frameworks/" + LDFLAGS="$LDFLAGS -L${enable_sdk}/usr/lib" + LDFLAGS="$LDFLAGS -F${enable_sdk}/System/Library/Frameworks/" fi PREFLAGS="$PREFLAGS -DOS_X -D_DARWIN_UNLIMITED_SELECT"