archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFH: - Added PHP_VERSION_ID == PHP_VERSION as integer.

Browse source
This commit is contained in:
foobar 2006-07-27 08:53:16 +00:00
parent ee97ffd887
commit 7625313f9c
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure.in
View file

@ -45,7 +45,8 @@ MAJOR_VERSION=5
MINOR_VERSION=2 MINOR_VERSION=2
RELEASE_VERSION=0 RELEASE_VERSION=0
EXTRA_VERSION="RC2-dev" 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 dnl Define where extension directories are located in the configure context
AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
@ -56,7 +57,6 @@ AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
dnl Setting up the PHP version based on the information above. dnl Setting up the PHP version based on the information above.
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
PHP_VERSION=$VERSION
echo "/* automatically generated by configure */" > php_version.h.new echo "/* automatically generated by configure */" > php_version.h.new
echo "/* edit configure.in to change version number */" >> 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 echo "#define PHP_MAJOR_VERSION $MAJOR_VERSION" >> php_version.h.new
@ -64,6 +64,7 @@ echo "#define PHP_MINOR_VERSION $MINOR_VERSION" >> php_version.h.new
echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new 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_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new
echo "#define PHP_VERSION \"$PHP_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 cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1
if test $? -ne 0 ; then if test $? -ne 0 ; then
rm -f $srcdir/main/php_version.h && mv php_version.h.new $srcdir/main/php_version.h && \ rm -f $srcdir/main/php_version.h && mv php_version.h.new $srcdir/main/php_version.h && \
@ -1196,6 +1197,7 @@ PHP_SUBST(OVERALL_TARGET)
PHP_SUBST(PHP_RPATHS) PHP_SUBST(PHP_RPATHS)
PHP_SUBST(PHP_SAPI) PHP_SUBST(PHP_SAPI)
PHP_SUBST_OLD(PHP_VERSION) PHP_SUBST_OLD(PHP_VERSION)
PHP_SUBST_OLD(PHP_VERSION_ID)
PHP_SUBST(SHELL) PHP_SUBST(SHELL)
PHP_SUBST(SHARED_LIBTOOL) PHP_SUBST(SHARED_LIBTOOL)
PHP_SUBST(WARNING_LEVEL) PHP_SUBST(WARNING_LEVEL)

1
main/php_version.h
View file

@ -5,3 +5,4 @@
#define PHP_RELEASE_VERSION 0 #define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "RC2-dev" #define PHP_EXTRA_VERSION "RC2-dev"
#define PHP_VERSION "5.2.0RC2-dev" #define PHP_VERSION "5.2.0RC2-dev"
#define PHP_VERSION_ID 50200

4
scripts/man1/php-config.1.in
View file

@ -43,6 +43,10 @@ Full path to php CLI/CGI binary
.B \-\-version .B \-\-version
PHP version PHP version
.TP .TP
.PD 0
.B \-\-vernum
PHP version as integer
.TP
.PD 1 .PD 1
.P .P
.SH SEE ALSO .SH SEE ALSO

5
scripts/php-config.in
View file

@ -3,6 +3,7 @@
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
version="@PHP_VERSION@" version="@PHP_VERSION@"
version_id="@PHP_VERSION_ID@"
includedir="@includedir@/php" includedir="@includedir@/php"
includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib" includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib"
ldflags="@PHP_LDFLAGS@" ldflags="@PHP_LDFLAGS@"
@ -30,8 +31,10 @@ case "$1" in
echo $php_binary;; echo $php_binary;;
--version) --version)
echo $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;; exit 1;;
esac esac