[32167] trunk/base

Tue Dec 18 15:12:26 PST 2007

Revision: 32167
          http://trac.macosforge.org/projects/macports/changeset/32167
Author:   jmpp at macports.org
Date:     2007-12-18 15:11:29 -0800 (Tue, 18 Dec 2007)

Log Message:
-----------

 * base/configure.ac: reorder the macros reading our version number from the base/config/mp_version file, export MP_VERSION
   (It would be great to figure out how to use the result of $MP_VERSION in AC_INIT, to avoid the code duplication that's
    present with the esyscmd command);
 * configure: regen;
 * base/src/macports1.0/macports_autoconf.tcl.in: save the MacPorts version number in the macports1.0 namespace as `macports_version`.

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/configure.ac
    trunk/base/src/macports1.0/macports_autoconf.tcl.in

Modified: trunk/base/configure
===================================================================

--- trunk/base/configure	2007-12-18 21:55:06 UTC (rev 32166)
+++ trunk/base/configure	2007-12-18 23:11:29 UTC (rev 32167)
@@ -665,8 +665,9 @@
 target_cpu
 target_vendor
 target_os
+VER
+MP_VERSION
 SW_VERS
-VER
 CC
 CFLAGS
 LDFLAGS
@@ -2024,6 +2025,16 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+# Read in the MacPorts version from the base/config/mp_vesion file and translate it (e.g. 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; }
+MP_VERSION=$(cat config/mp_version | tr -d '\n')
+VER=`echo $MP_VERSION | sed -e 's/\([0-9]\)\.\([0-9]\)0\{0,1\}\([0-9][1-9]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
+{ echo "$as_me:$LINENO: result: $VER" >&5
+echo "${ECHO_T}$VER" >&6; }
+
+
+
 # Check user PATH for MP paths, and remove as necessary.
 
 	oldprefix=$prefix
@@ -2146,15 +2157,6 @@
     ;;
 esac
 
-# 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; }
-MP_VERSION=`cat config/mp_version | tr -d '\n'`
-VER=`echo $MP_VERSION | sed -e 's/\([0-9]\)\.\([0-9]\)0\{0,1\}\([0-9][1-9]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
-{ echo "$as_me:$LINENO: result: $VER" >&5
-echo "${ECHO_T}$VER" >&6; }
-
-
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -12825,8 +12827,9 @@
 target_cpu!$target_cpu$ac_delim
 target_vendor!$target_vendor$ac_delim
 target_os!$target_os$ac_delim
+VER!$VER$ac_delim
+MP_VERSION!$MP_VERSION$ac_delim
 SW_VERS!$SW_VERS$ac_delim
-VER!$VER$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -12872,7 +12875,6 @@
 OBJC_LIBS!$OBJC_LIBS$ac_delim
 OBJC_PTHREAD_LIBS!$OBJC_PTHREAD_LIBS$ac_delim
 OBJC_PTHREAD_CFLAGS!$OBJC_PTHREAD_CFLAGS$ac_delim
-OBJC_FOUNDATION!$OBJC_FOUNDATION$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -12914,6 +12916,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+OBJC_FOUNDATION!$OBJC_FOUNDATION$ac_delim
 OBJC_FOUNDATION_LDFLAGS!$OBJC_FOUNDATION_LDFLAGS$ac_delim
 OBJC_FOUNDATION_CPPFLAGS!$OBJC_FOUNDATION_CPPFLAGS$ac_delim
 OBJC_FOUNDATION_LIBS!$OBJC_FOUNDATION_LIBS$ac_delim
@@ -12974,7 +12977,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; 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-12-18 21:55:06 UTC (rev 32166)
+++ trunk/base/configure.ac	2007-12-18 23:11:29 UTC (rev 32167)
@@ -6,6 +6,14 @@
 AC_CONFIG_HEADERS([src/config.h])
 AC_CANONICAL_SYSTEM
 
+# Read in the MacPorts version from the base/config/mp_vesion file and translate it (e.g. 1.600) to regular version (1.6.0)
+AC_MSG_CHECKING(MacPorts version)
+MP_VERSION=$(cat config/mp_version | tr -d '\n')
+VER=`echo $MP_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)0\{0,1\}\([[0-9]][[1-9]]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
+AC_MSG_RESULT([$VER])
+AC_SUBST(VER)
+AC_SUBST(MP_VERSION)
+
 # Check user PATH for MP paths, and remove as necessary.
 MP_PATH_SCAN
 
@@ -55,13 +63,6 @@
     ;;
 esac
 
-# 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'`
-VER=`echo $MP_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)0\{0,1\}\([[0-9]][[1-9]]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
-AC_MSG_RESULT([$VER])
-AC_SUBST(VER)
-
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_OBJC

Modified: trunk/base/src/macports1.0/macports_autoconf.tcl.in
===================================================================
--- trunk/base/src/macports1.0/macports_autoconf.tcl.in	2007-12-18 21:55:06 UTC (rev 32166)
+++ trunk/base/src/macports1.0/macports_autoconf.tcl.in	2007-12-18 23:11:29 UTC (rev 32167)
@@ -33,6 +33,7 @@
 
 namespace eval macports::autoconf {
     variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
+    variable macports_version "@MP_VERSION@"
     variable macports_user_dir "~/.macports"
     variable svn_path "@SVN@"
     variable rsync_path "@RSYNC@"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071218/34fa3b1c/attachment.html
