sniper Mon Mar 14 04:47:34 2005 EDT
Removed files:
/php-src/ext/pdo_sqlite Makefile.frag
Modified files:
/php-src/ext/pdo_sqlite config.m4
Log:
- Back to stone-age
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.16
php-src/ext/pdo_sqlite/config.m4:1.17
--- php-src/ext/pdo_sqlite/config.m4:1.16 Sun Mar 13 20:09:49 2005
+++ php-src/ext/pdo_sqlite/config.m4 Mon Mar 14 04:47:31 2005
@@ -1,11 +1,11 @@
-dnl $Id: config.m4,v 1.16 2005/03/14 01:09:49 sniper Exp $
+dnl $Id: config.m4,v 1.17 2005/03/14 09:47:31 sniper Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
if test "$PHP_PDO" != "no"; then
PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
-[ --with-pdo-sqlite[=DIR] Include PDO sqlite 3 support.],yes)
+[ --with-pdo-sqlite Include PDO sqlite 3 support],yes)
if test "$PHP_PDO_SQLITE" != "no"; then
@@ -83,14 +83,21 @@
PHP_ADD_BUILD_DIR($ext_builddir/sqlite)
PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src)
- PHP_ADD_BUILD_DIR($ext_builddir/sqlite/tool)
- PHP_ADD_MAKEFILE_FRAGMENT
-
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_srcdir/sqlite3.h
+ if ! test -f $ext_srcdir/sqlite/src/parse.h ; then
+ $CC -o $ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/tool/lemon.c
+ $ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/src/parse.y
+ cat $ext_srcdir/sqlite/src/parse.h $ext_srcdir/sqlite/src/vdbe.c
| awk -f $ext_srcdir/sqlite/mkopcodeh.awk > $ext_srcdir/sqlite/src/opcodes.h
+ sort -n +2 $ext_srcdir/sqlite/src/opcodes.h | awk -f
$ext_srcdir/sqlite/mkopcodec.awk > $ext_srcdir/sqlite/src/opcodes.c
+ $CC -o $ext_srcdir/sqlite/tool/mkkeywordhash
$ext_srcdir/sqlite/tool/mkkeywordhash.c
+ $ext_srcdir/sqlite/tool/mkkeywordhash >
$ext_srcdir/sqlite/src/keywordhash.h
+ else
+ touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.y
+ fi
if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then
echo '#include "php_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
