[55593] branches/release_1_8

[jmr at macports.org]

Revision: 55593
          http://trac.macports.org/changeset/55593
Author:   jmr at macports.org
Date:     2009-08-14 04:07:30 -0700 (Fri, 14 Aug 2009)
Log Message:
-----------
merge r55591 from trunk:
 update supported versions of OS X and Xcode in configure, and error on non-working OS versions

Revision Links:
--------------
    http://trac.macports.org/changeset/55591

Modified Paths:
--------------
    branches/release_1_8/base/configure
    branches/release_1_8/base/configure.ac

Property Changed:
----------------
    branches/release_1_8/
    branches/release_1_8/base/


Property changes on: branches/release_1_8
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:55268,55279,55281,55285,55317,55385,55417
   + /trunk:55268,55279,55281,55285,55317,55385,55417,55591


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/configure
===================================================================
--- branches/release_1_8/base/configure	2009-08-14 10:58:40 UTC (rev 55592)
+++ branches/release_1_8/base/configure	2009-08-14 11:07:30 UTC (rev 55593)
@@ -2885,19 +2885,17 @@
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Mac OS X is not supported" >&5
-$as_echo "$as_me: WARNING: This version of Mac OS X is not supported" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please upgrade at http://store.apple.com/" >&5
-$as_echo "$as_me: WARNING: Please upgrade at http://store.apple.com/" >&2;}
+  10.0*|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
     ;;
-  10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-6])
+  10.4.[0-9]|10.4.10|10.5.[0-7])
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Mac OS X is out of date" >&5
 $as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please run Software Update to update it" >&5
 $as_echo "$as_me: WARNING: Please run Software Update to update it" >&2;}
     ;;
-  10.3*|10.4*|10.5*)
+  10.4*|10.5*|10.6*)
         ;;
   *)
     ;;
@@ -2941,7 +2939,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please consider upgrading as some ports fail compiling" >&5
 $as_echo "$as_me: WARNING: Please consider upgrading as some ports fail compiling" >&2;}
     ;;
-  1.5*|2.4*|3.*)
+  1.5*|2.*|3.*)
         ;;
   *)
     ;;

Modified: branches/release_1_8/base/configure.ac
===================================================================
--- branches/release_1_8/base/configure.ac	2009-08-14 10:58:40 UTC (rev 55592)
+++ branches/release_1_8/base/configure.ac	2009-08-14 11:07:30 UTC (rev 55593)
@@ -28,15 +28,15 @@
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*)
-    AC_MSG_WARN([This version of Mac OS X is not supported])
-    AC_MSG_WARN([Please upgrade at http://store.apple.com/])
+  10.0*|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/])
     ;;
-  10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-6]])
+  10.4.[[0-9]]|10.4.10|10.5.[[0-7]])
     AC_MSG_WARN([This version of Mac OS X is out of date])
     AC_MSG_WARN([Please run Software Update to update it])
     ;;
-  10.3*|10.4*|10.5*)
+  10.4*|10.5*|10.6*)
     dnl Supported version
     ;;
   *)
@@ -73,7 +73,7 @@
     AC_MSG_WARN([This version of Xcode Tools is out of date])
     AC_MSG_WARN([Please consider upgrading as some ports fail compiling])
     ;;
-  1.5*|2.4*|3.*)
+  1.5*|2.*|3.*)
     dnl Supported version
     ;;
   *)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090814/cd9e0a46/attachment.html>