diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/configure.in b/configure.in index ad10964a3..842daea42 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.56 2006/08/23 13:17:36 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.52.2.24 2006/10/30 23:06:22 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -10,6 +10,8 @@ dnl ## options and check for the basic compile tools. dnl ## Diversion 2 is the initial checking of OS features, programs, dnl ## libraries and so on. + + dnl ## In diversion 3 we check for compile-time options to the PHP dnl ## core and how to deal with different system dependencies. This dnl ## includes what regex library is used and whether debugging or short @@ -40,10 +42,11 @@ PHP_CANONICAL_HOST_TARGET AC_CONFIG_HEADER(main/php_config.h) MAJOR_VERSION=5 -MINOR_VERSION=1 -RELEASE_VERSION=6 +MINOR_VERSION=2 +RELEASE_VERSION=0 EXTRA_VERSION="" -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 +57,6 @@ AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl 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 +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_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 && \ @@ -208,6 +211,7 @@ dnl Include Zend and TSRM configurations. dnl ------------------------------------------------------------------------- sinclude(Zend/Zend.m4) +sinclude(TSRM/threads.m4) sinclude(TSRM/tsrm.m4) @@ -372,6 +376,7 @@ sys/vfs.h \ sys/sysexits.h \ sys/varargs.h \ sys/wait.h \ +sys/loadavg.h \ termios.h \ unistd.h \ unix.h \ @@ -503,6 +508,7 @@ scandir \ setitimer \ setlocale \ localeconv \ +setenv \ setpgid \ setsockopt \ setvbuf \ @@ -659,10 +665,12 @@ if test "$PHP_GCOV" = "yes"; then dnl Remove all optimization flags from CFLAGS changequote({,}) CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` + CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'` changequote([,]) dnl Add the special gcc flags CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage" + CXXFLAGS="$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage" fi PHP_ARG_ENABLE(debug, whether to include debugging symbols, @@ -671,6 +679,12 @@ PHP_ARG_ENABLE(debug, whether to include debugging symbols, if test "$PHP_DEBUG" = "yes"; then PHP_DEBUG=1 ZEND_DEBUG=yes + changequote({,}) + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` + CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'` + changequote([,]) + CFLAGS="$CFLAGS -O0" + CXXFLAGS="$CXXFLAGS -O0" else PHP_DEBUG=0 ZEND_DEBUG=no @@ -874,6 +888,13 @@ if test "$PHP_VERSIONING" = "yes"; then if test -n "$PHP_MODULES"; then AC_MSG_ERROR([--enable-versioning cannot be used with shared modules]) fi + + case $host_alias in + *darwin*) + AC_MSG_ERROR([--enable-versioning is not supported on your platform]) + ;; + esac + test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym" if test -f "$PHP_SYM_FILE"; then EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE $EXTRA_LDFLAGS" @@ -1192,6 +1213,7 @@ PHP_SUBST(OVERALL_TARGET) 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) |