sniper Thu Jul 27 08:50:42 2006 UTC Modified files: /php-src configure.in /php-src/scripts php-config.in /php-src/scripts/man1 php-config.1.in /php-src/main php_version.h Log: - Added PHP_VERSION_ID == PHP_VERSION as integer value. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.606&r2=1.607&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.606 php-src/configure.in:1.607 --- php-src/configure.in:1.606 Wed Jul 26 08:57:10 2006 +++ php-src/configure.in Thu Jul 27 08:50:40 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.606 2006/07/26 08:57:10 tony2001 Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.607 2006/07/27 08:50:40 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -43,7 +43,8 @@ MINOR_VERSION=0 RELEASE_VERSION=0 EXTRA_VERSION="-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 @@ -54,7 +55,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 @@ -62,6 +62,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 && \ @@ -1145,6 +1146,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/scripts/php-config.in?r1=1.6&r2=1.7&diff_format=u Index: php-src/scripts/php-config.in diff -u php-src/scripts/php-config.in:1.6 php-src/scripts/php-config.in:1.7 --- php-src/scripts/php-config.in:1.6 Thu Jul 27 01:19:42 2006 +++ php-src/scripts/php-config.in Thu Jul 27 08:50:41 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.5&r2=1.6&diff_format=u Index: php-src/scripts/man1/php-config.1.in diff -u php-src/scripts/man1/php-config.1.in:1.5 php-src/scripts/man1/php-config.1.in:1.6 --- php-src/scripts/man1/php-config.1.in:1.5 Sun Jan 1 13:09:58 2006 +++ php-src/scripts/man1/php-config.1.in Thu Jul 27 08:50:41 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 http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.113&r2=1.114&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.113 php-src/main/php_version.h:1.114 --- php-src/main/php_version.h:1.113 Tue Aug 9 08:47:58 2005 +++ php-src/main/php_version.h Thu Jul 27 08:50:41 2006 @@ -5,3 +5,4 @@ #define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "-dev" #define PHP_VERSION "6.0.0-dev" +#define PHP_VERSION_ID "60000"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php