cvs: php-src /ext/pdo_sqlite config.m4 /ext/sqlite3 config.m4
| From: | Scott MacVicar | Date: | Mon, 12 Jan 2009 19:02:41 +0000 |
| Subject: | cvs: php-src /ext/pdo_sqlite config.m4 /ext/sqlite3 config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55576@lists.php.net to get a copy of this message | ||
scottmac Mon Jan 12 19:02:41 2009 UTC
Removed files:
/php-src/ext/sqlite3 config.m4
Modified files:
/php-src/ext/pdo_sqlite config.m4
Log:
Fix building of pdo_sqlite without sqlite3
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.40&r2=1.41&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.40 php-src/ext/pdo_sqlite/config.m4:1.41
--- php-src/ext/pdo_sqlite/config.m4:1.40 Fri Aug 1 12:02:40 2008
+++ php-src/ext/pdo_sqlite/config.m4 Mon Jan 12 19:02:41 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.40 2008/08/01 12:02:40 scottmac Exp $
+dnl $Id: config.m4,v 1.41 2009/01/12 19:02:41 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)