Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:23050 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 7478 invoked by uid 1010); 30 Apr 2006 12:41:09 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 7461 invoked from network); 30 Apr 2006 12:41:09 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 30 Apr 2006 12:41:09 -0000 X-PHP-List-Original-Sender: steph@zend.com X-Host-Fingerprint: 192.38.9.232 gw2.emini.dk Linux 2.4/2.6 Received: from ([192.38.9.232:4232] helo=gw2.emini.dk) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id 4C/BB-18514-460B4544 for ; Sun, 30 Apr 2006 08:41:09 -0400 Received: from foxbox (unknown [84.228.8.209]) by gw2.emini.dk (Postfix) with ESMTP id A50B4AF1E9; Sun, 30 Apr 2006 14:40:53 +0200 (CEST) Message-ID: <0bc701c66c53$21439380$6602a8c0@foxbox> Reply-To: "Steph Fox" To: "Wez Furlong" Cc: "internals" Date: Sun, 30 Apr 2006 14:39:30 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0BC4_01C66C63.E3E42660" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.2180 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180 Subject: Fw: [PHP-DEV] [PATCH] win32, PDO and the SQLite build From: steph@zend.com ("Steph Fox") ------=_NextPart_000_0BC4_01C66C63.E3E42660 Content-Type: text/plain; format=flowed; charset="Windows-1252"; reply-type=original Content-Transfer-Encoding: 7bit erm, that should've read if (PHP_SQLITE == "yes") { - Steph > Hi Wez, > > The attached patch makes it possible to build either php_sqlite.dll > without > the PDO dependency, or php_pdo_sqlite2.dll with the PDO dependency. If > ext/sqlite is built as static it 'just works' (forcing a shared build only > if PDO is enabled as shared) but with the same distinctions, i.e. if > there's > PDO in there it has PDO support, otherwise it doesn't. ------=_NextPart_000_0BC4_01C66C63.E3E42660 Content-Type: text/plain; format=flowed; name="ext_sqlite.txt"; reply-type=original Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ext_sqlite.txt" Index: ext/sqlite/CREDITS =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /repository/php-src/ext/sqlite/CREDITS,v retrieving revision 1.7 diff -u -r1.7 CREDITS --- ext/sqlite/CREDITS 29 Apr 2004 22:57:23 -0000 1.7 +++ ext/sqlite/CREDITS 30 Apr 2006 11:39:39 -0000 @@ -1,2 +1,2 @@ -SQLite +SQLite 2.x Wez Furlong, Tal Peer, Marcus Boerger, Ilia Alshanetsky Index: ext/sqlite/config.w32 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /repository/php-src/ext/sqlite/config.w32,v retrieving revision 1.8.2.1 diff -u -r1.8.2.1 config.w32 --- ext/sqlite/config.w32 24 Sep 2005 15:13:13 -0000 1.8.2.1 +++ ext/sqlite/config.w32 30 Apr 2006 12:37:37 -0000 @@ -1,9 +1,9 @@ // $Id: config.w32,v 1.8.2.1 2005/09/24 15:13:13 edink Exp $ // vim:ft=3Djavascript =20 -ARG_WITH("sqlite", "SQLite support", "no"); +ARG_WITH("sqlite", "SQLite 2.x support", "yes"); =20 -if (PHP_SQLITE !=3D "no") { +if (PHP_SQLITE =3D=3D "yes") { copy_and_subst(configure_module_dirname + = "\\libsqlite\\src\\sqlite.h.in", configure_module_dirname + "\\libsqlite\\src\\sqlite.h", new Array( "--VERS--", file_get_contents(configure_module_dirname + = "\\libsqlite\\VERSION").replace(new RegExp("[\r\n]+", "g"), ""), @@ -13,18 +13,24 @@ FSO.CopyFile(configure_module_dirname + = "\\libsqlite\\src\\sqlite_config.w32.h", configure_module_dirname + "\\libsqlite\\src\\config.h"); =20 - if (FSO.FileExists(configure_module_dirname + = "\\..\\pdo\\php_pdo_driver.h")) { - PHP_SQLITE2_PDO_CFLAGS =3D " /DPHP_SQLITE2_HAVE_PDO=3D1 /I " + = configure_module_dirname + "\\.."; - ADD_EXTENSION_DEP('sqlite', 'pdo') + if (PHP_PDO !=3D "no") { + + if (PHP_PDO_SHARED) { + PHP_SQLITE_SHARED =3D "shared"; + } + + dllname=3D"php_pdo_sqlite2.dll"; + PHP_SQLITE2_PDO_CFLAGS =3D " /D PHP_SQLITE2_HAVE_PDO=3D1 /I " + = configure_module_dirname + "\\.."; + ADD_EXTENSION_DEP("sqlite", "pdo") } else { - PHP_SQLITE2_PDO_CFLAGS =3D ""; + dllname=3D"php_sqlite.dll"; + PHP_SQLITE2_PDO_CFLAGS=3D""; } -=09 + EXTENSION("sqlite", "sqlite.c sess_sqlite.c pdo_sqlite2.c", null, "/D PHP_SQLITE_EXPORTS /I " + configure_module_dirname + = "/libsqlite/src" + - PHP_SQLITE2_PDO_CFLAGS); - =09 -=09 + PHP_SQLITE2_PDO_CFLAGS, dllname); + ADD_SOURCES(configure_module_dirname + "/libsqlite/src", "opcodes.c = parse.c encode.c \ auth.c btree.c build.c delete.c expr.c func.c hash.c insert.c \ main.c os.c pager.c printf.c random.c select.c table.c tokenize.c \ @@ -35,5 +41,5 @@ if (!PHP_SQLITE_SHARED) { ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite.def"); } - ADD_EXTENSION_DEP('sqlite', 'spl') + ADD_EXTENSION_DEP("sqlite", "spl") } ------=_NextPart_000_0BC4_01C66C63.E3E42660--