[111640] trunk/base

[toby at macports.org]

Revision: 111640
          https://trac.macports.org/changeset/111640
Author:   toby at macports.org
Date:     2013-09-27 13:45:23 -0700 (Fri, 27 Sep 2013)
Log Message:
-----------
Update OS version detection.

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

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2013-09-27 17:09:35 UTC (rev 111639)
+++ trunk/base/aclocal.m4	2013-09-27 20:45:23 UTC (rev 111640)
@@ -511,6 +511,9 @@
 
   if test "x$UNIVERSAL_ARCHS" = "x"; then
     case "$MACOSX_VERSION" in
+      10.1[[0-9]]*)
+        UNIVERSAL_ARCHS="x86_64 i386"
+        ;;
       10.[[0-5]]*)
         UNIVERSAL_ARCHS="i386 ppc"
         ;;

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2013-09-27 17:09:35 UTC (rev 111639)
+++ trunk/base/configure	2013-09-27 20:45:23 UTC (rev 111640)
@@ -2949,7 +2949,7 @@
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*|10.3*)
+  10.0*|10.1|10.1.*|10.2*|10.3*)
     as_fn_error $? "This version of Mac OS X is not supported
                   Please upgrade at http://store.apple.com/" "$LINENO" 5
     ;;
@@ -8125,6 +8125,9 @@
 
   if test "x$UNIVERSAL_ARCHS" = "x"; then
     case "$MACOSX_VERSION" in
+      10.1[0-9]*)
+        UNIVERSAL_ARCHS="x86_64 i386"
+        ;;
       10.[0-5]*)
         UNIVERSAL_ARCHS="i386 ppc"
         ;;

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2013-09-27 17:09:35 UTC (rev 111639)
+++ trunk/base/configure.ac	2013-09-27 20:45:23 UTC (rev 111640)
@@ -28,7 +28,7 @@
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*|10.3*)
+  10.0*|10.1|10.1.*|10.2*|10.3*)
     AC_MSG_ERROR([This version of Mac OS X is not supported
                   Please upgrade at http://store.apple.com/])
     ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130927/1c278765/attachment.html>