[52395] trunk/base

[toby at macports.org]

Revision: 52395
          http://trac.macports.org/changeset/52395
Author:   toby at macports.org
Date:     2009-06-15 13:07:44 -0700 (Mon, 15 Jun 2009)
Log Message:
-----------
change universal_archs default on 10.6+, regen

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

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2009-06-15 20:03:19 UTC (rev 52394)
+++ trunk/base/aclocal.m4	2009-06-15 20:07:44 UTC (rev 52395)
@@ -492,7 +492,14 @@
   AC_ARG_WITH(universal-archs,[AS_HELP_STRING([--with-universal-archs="CPU"],[Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
 
   if test "x$UNIVERSAL_ARCHS" = "x"; then
-    UNIVERSAL_ARCHS="ppc i386"
+    case "$MACOSX_VERSION" in
+      10.[[0-5]]*)
+        UNIVERSAL_ARCHS="i386 ppc"
+        ;;
+      *)
+        UNIVERSAL_ARCHS="x86_64 i386"
+        ;;
+    esac
   fi
 
   AC_MSG_CHECKING([for Universal CPU architectures])

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2009-06-15 20:03:19 UTC (rev 52394)
+++ trunk/base/configure	2009-06-15 20:07:44 UTC (rev 52395)
@@ -8068,20 +8068,26 @@
 # Check for universal options
 
 
-
 # Check whether --with-universal-archs was given.
 if test "${with_universal_archs+set}" = set; then
   withval=$with_universal_archs; UNIVERSAL_ARCHS=${withval}
 fi
 
 
-	if test "x$UNIVERSAL_ARCHS" = "x"; then
-	    UNIVERSAL_ARCHS="ppc i386"
-	fi
+  if test "x$UNIVERSAL_ARCHS" = "x"; then
+    case "$MACOSX_VERSION" in
+      10.[0-5]*)
+        UNIVERSAL_ARCHS="i386 ppc"
+        ;;
+      *)
+        UNIVERSAL_ARCHS="x86_64 i386"
+        ;;
+    esac
+  fi
 
-    { $as_echo "$as_me:$LINENO: checking for Universal CPU architectures" >&5
+  { $as_echo "$as_me:$LINENO: checking for Universal CPU architectures" >&5
 $as_echo_n "checking for Universal CPU architectures... " >&6; }
-    { $as_echo "$as_me:$LINENO: result: $UNIVERSAL_ARCHS" >&5
+  { $as_echo "$as_me:$LINENO: result: $UNIVERSAL_ARCHS" >&5
 $as_echo "$UNIVERSAL_ARCHS" >&6; }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090615/684d3ffc/attachment.html>