diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2009-11-29 06:13:22 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2009-11-29 06:13:22 +0000 |
| commit | 937358ebc7a6e0eaaf2bc252015b3c1544eb48e6 (patch) | |
| tree | 3d0f41c0204403270439809ca9716c196f6add5e /acinclude.m4 | |
| parent | 20ee37900762d9fa19af8c83d9a9444e1c7c3466 (diff) | |
| download | php-git-937358ebc7a6e0eaaf2bc252015b3c1544eb48e6.tar.gz | |
Revert attempt at supporting both autoconf 2.13 and
modern versions in the same build chain. There are
simply too many broken things in 2.13 to make it work.
Cache handling is broken as well which is why I need
to revert the pdo_inc_path cache fix as well.
trunk is now 2.60+ only and I'll work on cleaning out
all the legacy cruft from there.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7873e07cb2..f022a8a75d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -29,10 +29,6 @@ AC_DEFUN([PHP_CONFIGURE_PART],[ AC_MSG_RESULT([${T_MD}$1${T_ME}]) ]) -AC_DEFUN([PHP_DIVERT],[ - ifdef([AC_PRESERVE_HELP_ORDER], [], [ divert($1) ] ) -]) - dnl ------------------------------------------------------------------------- dnl Build system helper macros dnl ------------------------------------------------------------------------- @@ -2740,17 +2736,17 @@ dnl dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]]) dnl AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[ - AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [ + AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_cv_inc_path=$abs_srcdir/ext + pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_cv_inc_path=$abs_srcdir/ext + pdo_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_cv_inc_path=$prefix/include/php/ext + pdo_inc_path=$prefix/include/php/ext fi ]) - if test -n "$pdo_cv_inc_path"; then + if test -n "$pdo_inc_path"; then ifelse([$1],[],:,[$1]) else ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2]) |