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_dblib | |
| 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_dblib')
| -rw-r--r-- | ext/pdo_dblib/config.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4 index ba8244c721..3410ba9c6b 100644 --- a/ext/pdo_dblib/config.m4 +++ b/ext/pdo_dblib/config.m4 @@ -59,19 +59,19 @@ if test "$PHP_PDO_DBLIB" != "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) ]) PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\"" - PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_DBLIB_DEFS) + PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_DBLIB_DEFS) AC_CHECK_LIB(dnet_stub, dnet_addr, [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD) AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ]) |