[47703] trunk/base

[toby at macports.org]

Revision: 47703
          http://trac.macports.org/changeset/47703
Author:   toby at macports.org
Date:     2009-03-03 18:05:43 -0800 (Tue, 03 Mar 2009)
Log Message:
-----------
simplify logic for detecting target/sdkroot, also work on versions other than 10.4/10.5

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2009-03-04 01:52:08 UTC (rev 47702)
+++ trunk/base/aclocal.m4	2009-03-04 02:05:43 UTC (rev 47703)
@@ -495,22 +495,19 @@
     AC_ARG_WITH(universal-archs,[AC_HELP_STRING([--with-universal-archs="CPU"], [Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
 
 	if test "x$UNIVERSAL_TARGET" = "x"; then
-	    if [test -d /Developer/SDKs/MacOSX10.5.sdk]; then
-		UNIVERSAL_TARGET=10.5
-		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
+	    UNIVERSAL_TARGET=${MACOSX_VERSION}
+	fi
+
+	if test "x$UNIVERSAL_SYSROOT" = "x"; then
+	    if test "${MACOSX_VERSION}" = "10.4"; then
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}u.sdk
 	    else
-		UNIVERSAL_TARGET=10.4
-		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}.sdk
 	    fi
-	else
-	    if test "x$UNIVERSAL_SYSROOT" = "x"; then
-		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${UNIVERSAL_TARGET}.sdk
-	    fi
 	fi
 
 	if test "x$UNIVERSAL_ARCHS" = "x"; then
-		#UNIVERSAL_ARCHS="ppc ppc64 i386 x86_64"
-		UNIVERSAL_ARCHS="ppc i386"
+	    UNIVERSAL_ARCHS="ppc i386"
 	fi
     
     AC_MSG_CHECKING([for Universal MDT version])

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2009-03-04 01:52:08 UTC (rev 47702)
+++ trunk/base/configure	2009-03-04 02:05:43 UTC (rev 47703)
@@ -7206,22 +7206,19 @@
 
 
 	if test "x$UNIVERSAL_TARGET" = "x"; then
-	    if test -d /Developer/SDKs/MacOSX10.5.sdk; then
-		UNIVERSAL_TARGET=10.5
-		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
+	    UNIVERSAL_TARGET=${MACOSX_VERSION}
+	fi
+
+	if test "x$UNIVERSAL_SYSROOT" = "x"; then
+	    if test "${MACOSX_VERSION}" = "10.4"; then
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}u.sdk
 	    else
-		UNIVERSAL_TARGET=10.4
-		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}.sdk
 	    fi
-	else
-	    if test "x$UNIVERSAL_SYSROOT" = "x"; then
-		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${UNIVERSAL_TARGET}.sdk
-	    fi
 	fi
 
 	if test "x$UNIVERSAL_ARCHS" = "x"; then
-		#UNIVERSAL_ARCHS="ppc ppc64 i386 x86_64"
-		UNIVERSAL_ARCHS="ppc i386"
+	    UNIVERSAL_ARCHS="ppc i386"
 	fi
 
     { $as_echo "$as_me:$LINENO: checking for Universal MDT version" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090303/19863f88/attachment.html>