fixup the build in HEAD again... moved the maintainer only stuff out of the

config.m4 and into a separate script to make it cleaner

diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index 11bbaaf27a722f7f2fcc63b8c0facb63ff7c5c4a..71244cdf164a88f1472937558ff9f16738760b49 100644 (file)
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -91,19 +91,8 @@ if test "$PHP_PDO_SQLITE" != "no"; then
       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/ $abs_srcdir/sqlite/src/sqlite.h.in > $abs_srcdir/sqlite/src/sqlite3.h
-      if ! test -f $abs_srcdir/sqlite/src/parse.h ; then
-        dnl maintainer can comment this line out when upgrading the bundled library
-        dnl and reinstate it when done
-        AC_MSG_ERROR([this package is broken])
-        $CC -o $abs_srcdir/sqlite/tool/lemon $abs_srcdir/sqlite/tool/lemon.c
-        $abs_srcdir/sqlite/tool/lemon $abs_srcdir/sqlite/src/parse.y
-        cat $abs_srcdir/sqlite/src/parse.h $abs_srcdir/sqlite/src/vdbe.c | $AWK -f $abs_srcdir/sqlite/mkopcodeh.awk > $abs_srcdir/sqlite/src/opcodes.h
-        sort -n +2 $abs_srcdir/sqlite/src/opcodes.h | $AWK -f $abs_srcdir/sqlite/mkopcodec.awk > $abs_srcdir/sqlite/src/opcodes.c
-        $CC -o $abs_srcdir/sqlite/tool/mkkeywordhash $abs_srcdir/sqlite/tool/mkkeywordhash.c
-        $abs_srcdir/sqlite/tool/mkkeywordhash > $abs_srcdir/sqlite/src/keywordhash.h
-      else
-        touch $abs_srcdir/sqlite/src/parse.c $abs_srcdir/sqlite/src/parse.h
-      fi
+
+      touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
 
       if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then
         echo '#include <php_config.h>' > $ext_srcdir/sqlite/src/config.h

diff --git a/ext/pdo_sqlite/post-bundle.sh b/ext/pdo_sqlite/post-bundle.sh
new file mode 100755 (executable)
index 0000000..e60cc85
--- /dev/null
+++ b/ext/pdo_sqlite/post-bundle.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Run this script after updating the bundled sqlite library
+
+cc -o sqlite/tool/lemon sqlite/tool/lemon.c
+./sqlite/tool/lemon sqlite/src/parse.y
+cat sqlite/src/parse.h sqlite/src/vdbe.c | awk -f sqlite/mkopcodeh.awk > sqlite/src/opcodes.h
+sort -n +2 sqlite/src/opcodes.h | awk -f sqlite/mkopcodec.awk > sqlite/src/opcodes.c
+cc -o sqlite/tool/mkkeywordhash sqlite/tool/mkkeywordhash.c
+./sqlite/tool/mkkeywordhash > sqlite/src/keywordhash.h