From 438cc7f2013308cebe90d10fff696a0915cc1885 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Sun, 15 May 2011 06:09:21 +0000 Subject: [PATCH] Drop support for autoconf < 2.60 in trunk and the new PHP_5_4 branch. autoconf >= 2.60 should finally be working now. --- build/buildcheck.sh | 16 ++++---------- configure.in | 50 ++---------------------------------------- ext/standard/config.m4 | 4 ---- scripts/php-config.in | 1 + scripts/phpize.in | 1 + scripts/phpize.m4 | 5 ++--- 6 files changed, 10 insertions(+), 67 deletions(-) diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 4d76bf24d4..2815e3e0e6 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -28,32 +28,24 @@ if test -z "$PHP_AUTOCONF"; then PHP_AUTOCONF='autoconf' fi -# autoconf 2.13 or newer +# autoconf 2.60 or newer ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` if test -z "$ac_version"; then echo "buildconf: autoconf not found." -echo " You need autoconf version 2.13 or newer installed" +echo " You need autoconf version 2.60 or newer installed" echo " to build PHP from SVN." exit 1 fi IFS=.; set $ac_version; IFS=' ' -if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then +if test "$1" = "2" -a "$2" -lt "60" || test "$1" -lt "2"; then echo "buildconf: autoconf version $ac_version found." -echo " You need autoconf version 2.13 or newer installed" +echo " You need autoconf version 2.60 or newer installed" echo " to build PHP from SVN." exit 1 else echo "buildconf: autoconf version $ac_version (ok)" fi -if test "$1" = "2" && test "$2" -ge "50"; then - echo "buildconf: Your version of autoconf likely contains buggy cache code." - echo " Running vcsclean for you." - echo " To avoid this, install autoconf-2.13." - ./vcsclean - stamp= -fi - test -n "$stamp" && touch $stamp exit 0 diff --git a/configure.in b/configure.in index b0c0c65654..a641a1d2f2 100644 --- a/configure.in +++ b/configure.in @@ -1,28 +1,6 @@ ## $Id$ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) - -dnl ## Diversion 1 is the autoconf + automake setup phase. We also -dnl ## set the PHP version, deal with platform-specific compile -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. -dnl ## This includes whether debugging or short tags are enabled -dnl ## and the default behaviour of php.ini options. -dnl ## This is also where an SAPI interface is selected (choosing between -dnl ## Apache module, CGI etc.) - -dnl ## In diversion 4 we check user-configurable general settings. - -dnl ## In diversion 5 we check which extensions should be compiled. -dnl ## All of these are normally in the extension directories. -dnl ## Diversion 5 is the last one. Here we generate files and clean up. - dnl include Zend specific macro definitions first dnl ------------------------------------------------------------------------- sinclude(Zend/acinclude.m4) @@ -30,8 +8,9 @@ sinclude(Zend/acinclude.m4) dnl Basic autoconf + automake initialization, generation of config.nice. dnl ------------------------------------------------------------------------- -AC_PREREQ(2.13) +AC_PREREQ(2.60) AC_INIT(README.SVN-RULES) +AC_PRESERVE_HELP_ORDER PHP_CONFIG_NICE(config.nice) @@ -289,15 +268,6 @@ sinclude(Zend/Zend.m4) sinclude(TSRM/threads.m4) sinclude(TSRM/tsrm.m4) - -divert(2) - -dnl ## Diversion 2 is where we set PHP-specific options and come up -dnl ## with reasonable default values for them. We check for pthreads here -dnl ## because the information is needed by the SAPI configuration. -dnl ## This is also where an SAPI interface is selected (choosing between -dnl ## Apache module, CGI etc.) - dnl . dnl ------------------------------------------------------------------------- @@ -343,13 +313,6 @@ if test "$enable_maintainer_zts" = "yes"; then PTHREADS_FLAGS fi -divert(3) - -dnl ## In diversion 3 we check for compile-time options to the PHP -dnl ## core and how to deal with different system dependencies. -dnl ## This includes whether debugging or short tags are enabled -dnl ## and the default behaviour of php.ini options. - dnl Starting system checks. dnl ------------------------------------------------------------------------- @@ -689,10 +652,6 @@ if test "x$php_crypt_r" = "x1"; then PHP_CRYPT_R_STYLE fi -divert(4) - -dnl ## In diversion 4 we check user-configurable general settings. - dnl General settings. dnl ------------------------------------------------------------------------- PHP_CONFIGURE_PART(General settings) @@ -927,11 +886,6 @@ else AC_MSG_RESULT([using system default]) fi -divert(5) - -dnl ## In diversion 5 we check which extensions should be compiled. -dnl ## All of these are normally in the extension directories. - dnl Extension configuration. dnl ------------------------------------------------------------------------- diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index e28c351b5b..c33ae1e05c 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -1,7 +1,5 @@ dnl $Id$ -*- autoconf -*- -divert(3)dnl - dnl dnl Check if flush should be called explicitly after buffered io dnl @@ -342,8 +340,6 @@ dnl AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) AC_FUNC_FNMATCH -divert(5)dnl - dnl dnl Check if there is a support means of creating a new process dnl and defining which handles it receives diff --git a/scripts/php-config.in b/scripts/php-config.in index 13c25f2904..d6c62ccf39 100644 --- a/scripts/php-config.in +++ b/scripts/php-config.in @@ -2,6 +2,7 @@ SED="@SED@" prefix="@prefix@" +datarootdir="@datarootdir@" exec_prefix="@exec_prefix@" version="@PHP_VERSION@" vernum="@PHP_VERSION_ID@" diff --git a/scripts/phpize.in b/scripts/phpize.in index 40ccc77b1f..43cd8d30ff 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -2,6 +2,7 @@ # Variable declaration prefix='@prefix@' +datarootdir='@datarootdir@' exec_prefix="`eval echo @exec_prefix@`" phpdir="`eval echo @libdir@`/build" includedir="`eval echo @includedir@`/php" diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index e3a30a50c5..7faf6231da 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -1,9 +1,8 @@ dnl This file becomes configure.in for self-contained extensions. -divert(1) - -AC_PREREQ(2.13) +AC_PREREQ(2.60) AC_INIT(config.m4) +AC_PRESERVE_HELP_ORDER PHP_CONFIG_NICE(config.nice) -- 2.40.0