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 /ext/pdo_odbc | |
| 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 'ext/pdo_odbc')
| -rwxr-xr-x | ext/pdo_odbc/config.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 index b70dc9d539..36e506bd2c 100755 --- a/ext/pdo_odbc/config.m4 +++ b/ext/pdo_odbc/config.m4 @@ -47,15 +47,15 @@ if test "$PHP_PDO_ODBC" != "no"; then ],[ 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 else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_cv_inc_path) + AC_MSG_RESULT($pdo_inc_path) ]) AC_MSG_CHECKING([for selected PDO ODBC flavour]) @@ -165,7 +165,7 @@ functions required for PDO support. AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information]) ], $PDO_ODBC_LDFLAGS) - PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE) + PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE) PHP_SUBST(PDO_ODBC_SHARED_LIBADD) ifdef([PHP_ADD_EXTENSION_DEP], [ |