diff --git a/configure b/configure index c7593e31c..28d7d6250 100755 --- a/configure +++ b/configure @@ -2028,7 +2028,7 @@ test -n "$target_alias" && # 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; } diff --git a/configure.ac b/configure.ac index da9c0c04f..34883e032 100644 --- a/configure.ac +++ b/configure.ac @@ -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@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@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