rasmus Mon, 30 Nov 2009 19:13:50 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291517
Log: Fix bug #50337 Bug: http://bugs.php.net/50337 (Bogus) Caching of pdo_cv_inc_path breaks compile of PDO extensions Changed paths: U php/php-src/trunk/ext/sqlite/config.m4 Modified: php/php-src/trunk/ext/sqlite/config.m4 =================================================================== --- php/php-src/trunk/ext/sqlite/config.m4 2009-11-30 18:41:06 UTC (rev 291516) +++ php/php-src/trunk/ext/sqlite/config.m4 2009-11-30 19:13:50 UTC (rev 291517) @@ -50,7 +50,6 @@ PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) if test -n "$pdo_cv_inc_path"; then AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO]) - pdo_cv_inc_path="-I$pdo_cv_inc_path" fi fi @@ -83,13 +82,13 @@ -L$SQLITE_DIR/$PHP_LIBDIR -lm ]) SQLITE_MODULE_TYPE=external - PHP_SQLITE_CFLAGS=$pdo_cv_inc_path + PHP_SQLITE_CFLAGS="-I$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="-...@ext_srcdir@/libsqlite/src -...@ext_builddir@/libsqlite/src $pdo_cv_inc_path" + PHP_SQLITE_CFLAGS="-...@ext_srcdir@/libsqlite/src -...@ext_builddir@/libsqlite/src -I$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 \
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
