diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2011-05-15 06:09:21 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2011-05-15 06:09:21 +0000 |
| commit | 438cc7f2013308cebe90d10fff696a0915cc1885 (patch) | |
| tree | f436695d8d658154b2cc40cf5735d504db2abb88 /scripts | |
| parent | 08792f6f9bbf1e3cb905fc4719a37952b115dd10 (diff) | |
| download | php-git-438cc7f2013308cebe90d10fff696a0915cc1885.tar.gz | |
Drop support for autoconf < 2.60 in trunk and the
new PHP_5_4 branch. autoconf >= 2.60 should finally
be working now.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/php-config.in | 1 | ||||
| -rw-r--r-- | scripts/phpize.in | 1 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 5 |
3 files changed, 4 insertions, 3 deletions
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) |