cvs: php-src(PHP_5_3) /ext/pdo_sqlite config.m4 /ext/sqlite3 config.m4
| From: | Scott MacVicar | Date: | Mon, 12 Jan 2009 19:03:07 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/pdo_sqlite config.m4 /ext/sqlite3 config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55577@lists.php.net to get a copy of this message | ||
scottmac Mon Jan 12 19:03:07 2009 UTC
Removed files: (Branch: PHP_5_3)
/php-src/ext/sqlite3 config.m4
Modified files:
/php-src/ext/pdo_sqlite config.m4
Log:
MFH Fix building of pdo_sqlite without sqlite3
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.6&r2=1.26.2.9.2.7.2.7&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.6
php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.7
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.6 Thu Jul 31 23:56:32 2008
+++ php-src/ext/pdo_sqlite/config.m4 Mon Jan 12 19:03:07 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.9.2.7.2.6 2008/07/31 23:56:32 scottmac Exp $
+dnl $Id: config.m4,v 1.26.2.9.2.7.2.7 2009/01/12 19:03:07 scottmac Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -81,6 +81,10 @@
other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+ if test "$PHP_SQLITE3" != "yes"; then
+ PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c)
+ fi
+
PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core,
$ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path)