[32541] trunk/base

[eridius at macports.org]

Revision: 32541
          http://trac.macosforge.org/projects/macports/changeset/32541
Author:   eridius at macports.org
Date:     2008-01-07 11:28:25 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
Tweak autoconf scripts to avoid duplication of the shell stuff to read macports_version

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

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2008-01-07 18:21:37 UTC (rev 32540)
+++ trunk/base/configure	2008-01-07 19:28:25 UTC (rev 32541)
@@ -2028,7 +2028,7 @@
 # Read in the MacPorts version from the base/config/macports_vesion file
 { echo "$as_me:$LINENO: checking MacPorts version" >&5
 echo $ECHO_N "checking MacPorts version... $ECHO_C" >&6; }
-MACPORTS_VERSION=$(cat config/macports_version | tr -d '\n')
+MACPORTS_VERSION=1.7.0
 { echo "$as_me:$LINENO: result: $MACPORTS_VERSION" >&5
 echo "${ECHO_T}$MACPORTS_VERSION" >&6; }
 

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2008-01-07 18:21:37 UTC (rev 32540)
+++ trunk/base/configure.ac	2008-01-07 19:28:25 UTC (rev 32541)
@@ -1,14 +1,15 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([MacPorts], [esyscmd(cat config/macports_version | tr -d '\n')], [macports-dev at lists.macosforge.org], [macports])
+AC_DEFUN([MACPORTS_VERSION_MACRO], [esyscmd(cat config/macports_version | tr -d '\n')])
+AC_INIT([MacPorts], [MACPORTS_VERSION_MACRO], [macports-dev at lists.macosforge.org], [macports])
 AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
 AC_CONFIG_HEADERS([src/config.h])
 AC_CANONICAL_SYSTEM
 
 # Read in the MacPorts version from the base/config/macports_vesion file
 AC_MSG_CHECKING(MacPorts version)
-MACPORTS_VERSION=$(cat config/macports_version | tr -d '\n')
+MACPORTS_VERSION=MACPORTS_VERSION_MACRO
 AC_MSG_RESULT([$MACPORTS_VERSION])
 AC_SUBST(MACPORTS_VERSION)
 # Read the old, floating point format version, which we still use internally, and export it for the $macports::autoconf::macports_version variable

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080107/90f06e30/attachment-0001.html