[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
pajoye Wed May 3 11:12:54 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: - document the --with-pdo-sqlite[=dir] http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.8r2=1.26.2.9diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.8 php-src/ext/pdo_sqlite/config.m4:1.26.2.9 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.8 Sat Dec 31 00:56:06 2005 +++ php-src/ext/pdo_sqlite/config.m4Wed May 3 11:12:54 2006 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.8 2005/12/31 00:56:06 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.9 2006/05/03 11:12:54 pajoye Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -7,6 +7,9 @@ PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO, [ --without-pdo-sqlite PDO: sqlite 3 support],yes) +PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO, +[ --with-pdo-sqlite[=DIR] PDO: sqlite support. DIR is the sqlite base directory, the bundled sqlite is used by default]) + if test $PHP_PDO_SQLITE != no; then ifdef([PHP_CHECK_PDO_INCLUDES], -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
sniper Sat Dec 31 00:56:06 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: MFH:- Fixed bug #35377 (undefined reference to fdatasync) http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.7r2=1.26.2.8diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.7 php-src/ext/pdo_sqlite/config.m4:1.26.2.8 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.7 Sun Nov 27 22:59:54 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Dec 31 00:56:06 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.7 2005/11/27 22:59:54 tony2001 Exp $ +dnl $Id: config.m4,v 1.26.2.8 2005/12/31 00:56:06 sniper Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -85,6 +85,7 @@ $php_pdo_sqlite_sources_core $pdo_sqlite_sources, $ext_shared,,-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) + PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer]) @@ -111,8 +112,11 @@ EOF AC_CHECK_FUNCS(usleep nanosleep) AC_CHECK_HEADERS(time.h) - + + dnl Solaris fix + PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, PDO_SQLITE_SHARED_LIBADD)]) fi + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
tony2001Sun Nov 27 17:59:56 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: use || instead of -o to support weird systems with old `test` http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.6r2=1.26.2.7ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.6 php-src/ext/pdo_sqlite/config.m4:1.26.2.7 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.6 Mon Oct 31 22:13:32 2005 +++ php-src/ext/pdo_sqlite/config.m4Sun Nov 27 17:59:54 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.6 2005/11/01 03:13:32 wez Exp $ +dnl $Id: config.m4,v 1.26.2.7 2005/11/27 22:59:54 tony2001 Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -94,7 +94,7 @@ touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h - if test $ext_shared = no -o $ext_srcdir != $abs_srcdir; then + if test $ext_shared = no || test $ext_srcdir != $abs_srcdir; then echo '#include php_config.h' $ext_srcdir/sqlite/src/config.h else echo #include \$abs_builddir/config.h\ $ext_srcdir/sqlite/src/config.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
wez Mon Oct 31 22:13:33 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite config.m4
Log:
Closes PECL Bug #5633.
Build tested with 5.0.x as PECL, 5.1 as PECL and 5.1 static
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.5r2=1.26.2.6ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.5
php-src/ext/pdo_sqlite/config.m4:1.26.2.6
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.5 Sat Sep 24 22:28:42 2005
+++ php-src/ext/pdo_sqlite/config.m4Mon Oct 31 22:13:32 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.5 2005/09/25 02:28:42 wez Exp $
+dnl $Id: config.m4,v 1.26.2.6 2005/11/01 03:13:32 wez Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -83,14 +83,14 @@
PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core $pdo_sqlite_sources,
-$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1
-DSQLITE_OMIT_CURSOR -I$pdo_inc_path)
+$ext_shared,,-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1
-DSQLITE_OMIT_CURSOR -I$pdo_inc_path)
PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)
AC_CHECK_SIZEOF(char *,4)
AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F.
'{printf(%d%03d%03d, $1, $2, $3)}'`
- sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/
$ext_srcdir/sqlite/src/sqlite.h.in $ext_builddir/sqlite/src/sqlite3.h
+ sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/
$ext_srcdir/sqlite/src/sqlite.h.in $ext_srcdir/sqlite/src/sqlite3.h
touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
Hello Wez, i don't see your point here, pdo doesn't build against PHP 5.0 anyway. marcus Sunday, September 25, 2005, 4:28:47 AM, you wrote: wez Sat Sep 24 22:28:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: reinstate this fix for building against PHP 5.0.x. This works fine against PHP 5.1 too; if you revert this, you'd better have an awesome technical reason, or I'll remove your karma. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.4r2=1.26.2.5ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.4 php-src/ext/pdo_sqlite/config.m4:1.26.2.5 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.4 Sat Sep 24 19:33:58 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 22:28:42 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.4 2005/09/24 23:33:58 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.5 2005/09/25 02:28:42 wez Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
On Sun, 25 Sep 2005, Wez Furlong wrote: wez Sat Sep 24 22:28:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: reinstate this fix for building against PHP 5.0.x. Uhm, this is the PHP_5_1 branch, why should that work against 5.0? Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
Marcus Boerger wrote: Hello Wez, i don't see your point here, pdo doesn't build against PHP 5.0 anyway. PECL PDO does build against PHP 5.1 AND 5.0 (thanks to wez). But after the constants - class constant changes it does not load anymore into 5.0.5 and 5.1 RC1: http://pecl.php.net/bugs/bug.php?id=5514 (PECL PDO packages only load with the latest PHP snapshot at the moment) best regards Andreas PS: I'm talking about the PECL packages, because those are the same files (some symlinking AFAIR) Sunday, September 25, 2005, 4:28:47 AM, you wrote: wez Sat Sep 24 22:28:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: reinstate this fix for building against PHP 5.0.x. This works fine against PHP 5.1 too; if you revert this, you'd better have an awesome technical reason, or I'll remove your karma. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.4r2=1.26.2.5ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.4 php-src/ext/pdo_sqlite/config.m4:1.26.2.5 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.4 Sat Sep 24 19:33:58 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 22:28:42 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.4 2005/09/24 23:33:58 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.5 2005/09/25 02:28:42 wez Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
Yep, we need to provide a helper function for pdo when built against 5.0 that registers these class constants. --Wez. On 9/25/05, Andreas Korthaus [EMAIL PROTECTED] wrote: Marcus Boerger wrote: Hello Wez, i don't see your point here, pdo doesn't build against PHP 5.0 anyway. PECL PDO does build against PHP 5.1 AND 5.0 (thanks to wez). But after the constants - class constant changes it does not load anymore into 5.0.5 and 5.1 RC1: http://pecl.php.net/bugs/bug.php?id=5514 (PECL PDO packages only load with the latest PHP snapshot at the moment) best regards Andreas PS: I'm talking about the PECL packages, because those are the same files (some symlinking AFAIR) Sunday, September 25, 2005, 4:28:47 AM, you wrote: wez Sat Sep 24 22:28:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: reinstate this fix for building against PHP 5.0.x. This works fine against PHP 5.1 too; if you revert this, you'd better have an awesome technical reason, or I'll remove your karma. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.4r2=1.26.2.5ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.4 php-src/ext/pdo_sqlite/config.m4:1.26.2.5 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.4 Sat Sep 24 19:33:58 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 22:28:42 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.4 2005/09/24 23:33:58 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.5 2005/09/25 02:28:42 wez Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
wez Sat Sep 24 15:15:25 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: 99% certain that this fixes PECL #5366 and PECL #5391. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.1r2=1.26.2.2ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.1 php-src/ext/pdo_sqlite/config.m4:1.26.2.2 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.1 Sun Aug 28 12:53:20 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 15:15:23 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.1 2005/08/28 16:53:20 iliaa Exp $ +dnl $Id: config.m4,v 1.26.2.2 2005/09/24 19:15:23 wez Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
sniper Sat Sep 24 19:33:58 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: Revert the fix. It works fine when you use PHP_5_1 http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.3r2=1.26.2.4ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.3 php-src/ext/pdo_sqlite/config.m4:1.26.2.4 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.3 Sat Sep 24 19:23:25 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 19:33:58 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.3 2005/09/24 23:23:25 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.4 2005/09/24 23:33:58 sniper Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
wez Sat Sep 24 22:28:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: reinstate this fix for building against PHP 5.0.x. This works fine against PHP 5.1 too; if you revert this, you'd better have an awesome technical reason, or I'll remove your karma. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.4r2=1.26.2.5ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.4 php-src/ext/pdo_sqlite/config.m4:1.26.2.5 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.4 Sat Sep 24 19:33:58 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 22:28:42 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.4 2005/09/24 23:33:58 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.5 2005/09/25 02:28:42 wez Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
