cvs: php-src(PHP_5_2) / configure.in /main php_version.h /scripts php-config.in /scripts/man1 php-config.1.in

sniper Thu Jul 27 08:53:16 2006 UTC Modified files: (Branch: PHP_5_2) /php-src configure.in /php-src/main php_version.h /php-src/scripts php-config.in /php-src/scripts/man1 php-config.1.in Log: MFH: - Added PHP_VERSION_ID == PHP_VERSION as integer. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.5&r2=1.579.2.52.2.6&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.5 php-src/configure.in:1.579.2.52.2.6 --- php-src/configure.in:1.579.2.52.2.5 Wed Jul 26 08:57:44 2006 +++ php-src/configure.in Thu Jul 27 08:53:16 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.52.2.5 2006/07/26 08:57:44 tony2001 Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.52.2.6 2006/07/27 08:53:16 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -45,7 +45,8 @@ MINOR_VERSION=2 RELEASE_VERSION=0 EXTRA_VERSION="RC2-dev" -VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" +PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" +PHP_VERSION_ID=expr [$]MAJOR_VERSION \* 10000 + [$]MINOR_VERSION \* 100 + [$]RELEASE_VERSION dnl Define where extension directories are located in the configure context AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl @@ -56,7 +57,6 @@ dnl Setting up the PHP version based on the information above. dnl ------------------------------------------------------------------------- -PHP_VERSION=$VERSION echo "/* automatically generated by configure */" > php_version.h.new echo "/* edit configure.in to change version number */" >> php_version.h.new echo "#define PHP_MAJOR_VERSION $MAJOR_VERSION" >> php_version.h.new @@ -64,6 +64,7 @@ echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new echo "#define PHP_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new +echo "#define PHP_VERSION_ID $PHP_VERSION_ID" >> php_version.h.new cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 if test $? -ne 0 ; then rm -f $srcdir/main/php_version.h && mv php_version.h.new $srcdir/main/php_version.h && \ @@ -1196,6 +1197,7 @@ PHP_SUBST(PHP_RPATHS) PHP_SUBST(PHP_SAPI) PHP_SUBST_OLD(PHP_VERSION) +PHP_SUBST_OLD(PHP_VERSION_ID) PHP_SUBST(SHELL) PHP_SUBST(SHARED_LIBTOOL) PHP_SUBST(WARNING_LEVEL) http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.3&r2=1.112.2.37.2.4&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.3 php-src/main/php_version.h:1.112.2.37.2.4 --- php-src/main/php_version.h:1.112.2.37.2.3 Mon Jul 24 18:53:01 2006 +++ php-src/main/php_version.h Thu Jul 27 08:53:16 2006 @@ -5,3 +5,4 @@ #define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "RC2-dev" #define PHP_VERSION "5.2.0RC2-dev" +#define PHP_VERSION_ID 50200 http://cvs.php.net/viewvc.cgi/php-src/scripts/php-config.in?r1=1.3.2.2.2.1&r2=1.3.2.2.2.2&diff_format=u Index: php-src/scripts/php-config.in diff -u php-src/scripts/php-config.in:1.3.2.2.2.1 php-src/scripts/php-config.in:1.3.2.2.2.2 --- php-src/scripts/php-config.in:1.3.2.2.2.1 Thu Jul 27 01:20:09 2006 +++ php-src/scripts/php-config.in Thu Jul 27 08:53:16 2006 @@ -3,6 +3,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" version="@PHP_VERSION@" +version_id="@PHP_VERSION_ID@" includedir="@includedir@/php" includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib" ldflags="@PHP_LDFLAGS@" @@ -30,8 +31,10 @@ echo $php_binary;; --version) echo $version;; +--vernum) + echo $version_id;; *) - echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version]" + echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version|--vernum]" exit 1;; esac http://cvs.php.net/viewvc.cgi/php-src/scripts/man1/php-config.1.in?r1=1.3.2.2&r2=1.3.2.2.2.1&diff_format=u Index: php-src/scripts/man1/php-config.1.in diff -u php-src/scripts/man1/php-config.1.in:1.3.2.2 php-src/scripts/man1/php-config.1.in:1.3.2.2.2.1 --- php-src/scripts/man1/php-config.1.in:1.3.2.2 Sun Jan 1 12:50:19 2006 +++ php-src/scripts/man1/php-config.1.in Thu Jul 27 08:53:16 2006 @@ -43,6 +43,10 @@ .B \-\-version PHP version .TP +.PD 0 +.B \-\-vernum +PHP version as integer +.TP .PD 1 .P .SH SEE ALSO