diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2009-11-25 01:30:06 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2009-11-25 01:30:06 +0000 |
| commit | 5a2b41a6271be5dc04f3d0f15751b5c074fe29b7 (patch) | |
| tree | ef540211365d3c82ffdffdf0bf732f19f6954e5b /ext/pdo_sqlite | |
| parent | bb179ad150fdebfcc1128e0b25a132695dd39f92 (diff) | |
| download | php-git-5a2b41a6271be5dc04f3d0f15751b5c074fe29b7.tar.gz | |
Someone strap down Jani and give him a sedative please.
This makes our toolchain work with the latest versions
of autoconf and avoids a lot of end-user grief.
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 4e6dd2cb12..b2b70a5038 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -19,15 +19,15 @@ if test "$PHP_PDO_SQLITE" != "no"; then ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c" @@ -70,7 +70,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then ]) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) - PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path) + PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_cv_inc_path) else # use bundled libs if test "$enable_maintainer_zts" = "yes"; then @@ -92,7 +92,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, - $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path) + $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_cv_inc_path) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3) |