diff options
| author | Jani Taskinen <jani@php.net> | 2007-07-26 22:45:22 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-07-26 22:45:22 +0000 |
| commit | 452ace5e145775d5b74854dd0df2a323c27aa7fe (patch) | |
| tree | 508676c569974bfa12ec7f7d5e18c74a5db8639b /configure.in | |
| parent | a250d3400000098a52ab4e2a024758d151c44e73 (diff) | |
| download | php-git-452ace5e145775d5b74854dd0df2a323c27aa7fe.tar.gz | |
- Made build system less dependant for the PHP major version to also
ease MFB/MFH as acinclude.m4 and Makefile.global are identical in both
branches.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/configure.in b/configure.in index c1a2b5f6b8..02c6f28c9c 100644 --- a/configure.in +++ b/configure.in @@ -39,12 +39,18 @@ PHP_CANONICAL_HOST_TARGET AC_CONFIG_HEADER(main/php_config.h) -MAJOR_VERSION=6 -MINOR_VERSION=0 -RELEASE_VERSION=0 -EXTRA_VERSION="-dev" -PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" -PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 10000 + [$]MINOR_VERSION \* 100 + [$]RELEASE_VERSION` +PHP_MAJOR_VERSION=6 +PHP_MINOR_VERSION=0 +PHP_RELEASE_VERSION=0 +PHP_EXTRA_VERSION="-dev" +PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" +PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` + +dnl Allow version values to be used in Makefile +PHP_SUBST(PHP_MAJOR_VERSION) +PHP_SUBST(PHP_MINOR_VERSION) +PHP_SUBST(PHP_RELEASE_VERSION) +PHP_SUBST(PHP_EXTRA_VERSION) dnl Define where extension directories are located in the configure context AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl @@ -57,10 +63,10 @@ dnl ------------------------------------------------------------------------- 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 -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_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new +echo "#define PHP_MAJOR_VERSION $PHP_MAJOR_VERSION" >> php_version.h.new +echo "#define PHP_MINOR_VERSION $PHP_MINOR_VERSION" >> php_version.h.new +echo "#define PHP_RELEASE_VERSION $PHP_RELEASE_VERSION" >> php_version.h.new +echo "#define PHP_EXTRA_VERSION \"$PHP_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 @@ -188,7 +194,7 @@ case $host_alias in PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS) PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS) PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) - EXTENSION_DIR=sys:/php$MAJOR_VERSION/ext + EXTENSION_DIR=sys:/php$PHP_MAJOR_VERSION/ext PHP_SUBST(PHP5LIB_SHARED_LIBADD) PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware) ;; @@ -240,9 +246,9 @@ dnl SAPI configuration. dnl ------------------------------------------------------------------------- dnl paths to the targets are relative to the build directory -SAPI_SHARED=libs/libphp6.$SHLIB_DL_SUFFIX_NAME -SAPI_STATIC=libs/libphp6.a -SAPI_LIBTOOL=libphp6.la +SAPI_SHARED=libs/libphp[]$PHP_MAJOR_VERSION[.]$SHLIB_DL_SUFFIX_NAME +SAPI_STATIC=libs/libphp[]$PHP_MAJOR_VERSION[.a] +SAPI_LIBTOOL=libphp[]$PHP_MAJOR_VERSION[.la] PHP_CONFIGURE_PART(Configuring SAPI modules) |