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/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/sqlite')
-rw-r--r-- | ext/sqlite/config.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4 index dbee55fa94..a1699142ea 100644 --- a/ext/sqlite/config.m4 +++ b/ext/sqlite/config.m4 @@ -48,9 +48,9 @@ AC_DEFUN([PHP_PROG_LEMON],[ if test "$PHP_SQLITE" != "no"; then if test "$PHP_PDO" != "no"; then PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) - if test -n "$pdo_inc_path"; then + if test -n "$pdo_cv_inc_path"; then AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO]) - pdo_inc_path="-I$pdo_inc_path" + pdo_cv_inc_path="-I$pdo_cv_inc_path" fi fi @@ -83,13 +83,13 @@ if test "$PHP_SQLITE" != "no"; then -L$SQLITE_DIR/$PHP_LIBDIR -lm ]) SQLITE_MODULE_TYPE=external - PHP_SQLITE_CFLAGS=$pdo_inc_path + PHP_SQLITE_CFLAGS=$pdo_cv_inc_path sqlite_extra_sources="libsqlite/src/encode.c" else # use bundled library PHP_PROG_LEMON SQLITE_MODULE_TYPE=builtin - PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" + PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_cv_inc_path" sqlite_extra_sources="libsqlite/src/opcodes.c \ libsqlite/src/parse.c libsqlite/src/encode.c \ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ |