cvs: php-src /ext/pdo_sqlite config.m4

From: Date: Fri, 01 Aug 2008 12:02:40 +0000
Subject: cvs: php-src /ext/pdo_sqlite config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-51864@lists.php.net to get a copy of this message
scottmac Fri Aug 1 12:02:40 2008 UTC Modified files: /php-src/ext/pdo_sqlite config.m4 Log: MFB: Make pdo_sqlite use the bundled extension with sqlite3 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.39&r2=1.40&diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.39 php-src/ext/pdo_sqlite/config.m4:1.40 --- php-src/ext/pdo_sqlite/config.m4:1.39 Fri Jul 25 13:38:41 2008 +++ php-src/ext/pdo_sqlite/config.m4 Fri Aug 1 12:02:40 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.39 2008/07/25 13:38:41 jani Exp $ +dnl $Id: config.m4,v 1.40 2008/08/01 12:02:40 scottmac Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -72,21 +72,22 @@ PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path) else - # use bundled libs - pdo_sqlite_sources="libsqlite/sqlite3.c" - + # use bundled libs if test "$enable_maintainer_zts" = "yes"; then - threadsafe_flag="-DSQLITE_THREADSAFE=1" + threadsafe_flags="-DSQLITE_THREADSAFE=1" else - threadsafe_flag="-DSQLITE_THREADSAFE=0" + threadsafe_flags="-DSQLITE_THREADSAFE=0" fi + other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" + PHP_NEW_EXTENSION(pdo_sqlite, - $php_pdo_sqlite_sources_core $pdo_sqlite_sources, - $ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1 $threadsafe_flag -I$pdo_inc_path) + $php_pdo_sqlite_sources_core, + $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) - PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1) + PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3) + PHP_ADD_INCLUDE($abs_srcdir/ext/sqlite3/libsqlite) AC_CHECK_FUNCS(usleep nanosleep) AC_CHECK_HEADERS(time.h)

« previous php.cvs (#51864) next »