[30308] trunk/base

[source_changes at macosforge.org]

Revision: 30308
          http://trac.macosforge.org/projects/macports/changeset/30308
Author:   afb at macports.org
Date:     2007-10-24 03:24:39 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
add checks for Mac OS X and Xcode versions (see #12794)

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

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2007-10-24 10:20:57 UTC (rev 30307)
+++ trunk/base/configure	2007-10-24 10:24:39 UTC (rev 30308)
@@ -665,6 +665,7 @@
 target_cpu
 target_vendor
 target_os
+SW_VERS
 VER
 CC
 CFLAGS
@@ -2045,6 +2046,65 @@
 	prefix=$oldprefix
 
 
+for ac_prog in sw_vers
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_SW_VERS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$SW_VERS"; then
+  ac_cv_prog_SW_VERS="$SW_VERS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_SW_VERS="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+SW_VERS=$ac_cv_prog_SW_VERS
+if test -n "$SW_VERS"; then
+  { echo "$as_me:$LINENO: result: $SW_VERS" >&5
+echo "${ECHO_T}$SW_VERS" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$SW_VERS" && break
+done
+
+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.`
+  { echo "$as_me:$LINENO: result: $MACOSX_VERSION" >&5
+echo "${ECHO_T}$MACOSX_VERSION" >&6; }
+fi
+
+XCODEPLIST=/Developer/Applications/Xcode.app/Contents/version.plist
+if test -r "$XCODEPLIST"; then
+  { echo "$as_me:$LINENO: checking Xcode version" >&5
+echo $ECHO_N "checking Xcode version... $ECHO_C" >&6; }
+  XCODE_VERSION=`tr -d '\r\n' < $XCODEPLIST | sed -e 's/.*<key>CFBundleShortVersionString<\/key>.<string>\([0-9.]*\)<\/string>.*/\1/'`
+  { echo "$as_me:$LINENO: result: $XCODE_VERSION" >&5
+echo "${ECHO_T}$XCODE_VERSION" >&6; }
+fi
+
 # translate mp_version (1.600) to regular version (1.6.0)
 { echo "$as_me:$LINENO: checking MacPorts version" >&5
 echo $ECHO_N "checking MacPorts version... $ECHO_C" >&6; }
@@ -12697,6 +12757,7 @@
 target_cpu!$target_cpu$ac_delim
 target_vendor!$target_vendor$ac_delim
 target_os!$target_os$ac_delim
+SW_VERS!$SW_VERS$ac_delim
 VER!$VER$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
@@ -12744,7 +12805,6 @@
 OBJC_PTHREAD_LIBS!$OBJC_PTHREAD_LIBS$ac_delim
 OBJC_PTHREAD_CFLAGS!$OBJC_PTHREAD_CFLAGS$ac_delim
 OBJC_FOUNDATION!$OBJC_FOUNDATION$ac_delim
-OBJC_FOUNDATION_LDFLAGS!$OBJC_FOUNDATION_LDFLAGS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -12786,6 +12846,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+OBJC_FOUNDATION_LDFLAGS!$OBJC_FOUNDATION_LDFLAGS$ac_delim
 OBJC_FOUNDATION_CPPFLAGS!$OBJC_FOUNDATION_CPPFLAGS$ac_delim
 OBJC_FOUNDATION_LIBS!$OBJC_FOUNDATION_LIBS$ac_delim
 HAVE_FRAMEWORK_COREFOUNDATION!$HAVE_FRAMEWORK_COREFOUNDATION$ac_delim
@@ -12844,7 +12905,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2007-10-24 10:20:57 UTC (rev 30307)
+++ trunk/base/configure.ac	2007-10-24 10:24:39 UTC (rev 30308)
@@ -9,6 +9,20 @@
 # Check user PATH for MP paths, and remove as necessary.
 MP_PATH_SCAN
 
+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.`
+  AC_MSG_RESULT([$MACOSX_VERSION])
+fi
+
+XCODEPLIST=/Developer/Applications/Xcode.app/Contents/version.plist
+if test -r "$XCODEPLIST"; then
+  AC_MSG_CHECKING(Xcode version)
+  XCODE_VERSION=`tr -d '\r\n' < $XCODEPLIST | sed -e 's/.*<key>CFBundleShortVersionString<\/key>.<string>\([[0-9.]]*\)<\/string>.*/\1/'`
+  AC_MSG_RESULT([$XCODE_VERSION])
+fi
+
 # translate mp_version (1.600) to regular version (1.6.0)
 AC_MSG_CHECKING(MacPorts version)
 MP_VERSION=`cat config/mp_version | tr -d '\n'`

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071024/3b7cd5ce/attachment.html