Fix 'php-config --version'

diff --git a/configure.in b/configure.in
index 4fa017eace1e3c26b402ef9ec551c2b03e0f1546..2f17dad7d3fc16688673e3c287ebd63ca1e9345b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,6 @@ MAJOR_VERSION=4
 MINOR_VERSION=3
 RELEASE_VERSION=0
 EXTRA_VERSION="-dev"
-#VERSION="4.3.0-dev"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
@@ -1031,7 +1030,7 @@ PHP_SUBST_OLD(PHP_LIBS)
 PHP_SUBST(OVERALL_TARGET)
 PHP_SUBST(PHP_RPATHS)
 PHP_SUBST(PHP_SAPI)
-PHP_SUBST(PHP_VERSION)
+PHP_SUBST_OLD(PHP_VERSION)
 PHP_SUBST(PROG_SENDMAIL)
 PHP_SUBST(SHELL)
 PHP_SUBST(SHARED_LIBTOOL)

diff --git a/pear/scripts/php-config.in b/pear/scripts/php-config.in
index c2f850a00010970d9b1f7e2eafc29bbc0fbe9906..bcb6ef35f8741bab980ca3538791e0662d2a9282 100644 (file)
--- a/pear/scripts/php-config.in
+++ b/pear/scripts/php-config.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 prefix="@prefix@"
-version="@VERSION@"
+version="@PHP_VERSION@"
 includedir="@includedir@/php"
 includes="-I$includedir -I$includedir/main -I$includedir/Zend"
 if test '@TSRM_DIR@' != ''; then