[37552] trunk/base

[ryandesign at macports.org]

Revision: 37552
          http://trac.macosforge.org/projects/macports/changeset/37552
Author:   ryandesign at macports.org
Date:     2008-06-13 01:11:24 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
Properly detect Mac OS X versions earlier than Panther, where sw_vers doesn't accept any parameters

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

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2008-06-12 19:41:53 UTC (rev 37551)
+++ trunk/base/configure	2008-06-13 08:11:24 UTC (rev 37552)
@@ -2123,7 +2123,7 @@
 if test "x$SW_VERS" != "x"; then
   { echo "$as_me:$LINENO: checking Mac OS X version" >&5
 echo $ECHO_N "checking Mac OS X version... $ECHO_C" >&6; }
-  MACOSX_VERSION=`$SW_VERS -productVersion | cut -f 1-3 -d.`
+  MACOSX_VERSION=`$SW_VERS | sed -n "s/^ProductVersion:[[:space:]]//p" | cut -f 1-3 -d.`
   { echo "$as_me:$LINENO: result: $MACOSX_VERSION" >&5
 echo "${ECHO_T}$MACOSX_VERSION" >&6; }
 fi

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2008-06-12 19:41:53 UTC (rev 37551)
+++ trunk/base/configure.ac	2008-06-13 08:11:24 UTC (rev 37552)
@@ -22,7 +22,7 @@
 AC_CHECK_PROGS(SW_VERS, sw_vers)
 if test "x$SW_VERS" != "x"; then
   AC_MSG_CHECKING(Mac OS X version)
-  MACOSX_VERSION=`$SW_VERS -productVersion | cut -f 1-3 -d.`
+  MACOSX_VERSION=`$SW_VERS | sed -n "s/^ProductVersion:[[[:space:]]]//p" | cut -f 1-3 -d.`
   AC_MSG_RESULT([$MACOSX_VERSION])
 fi
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080613/eefdbdb1/attachment.htm