Fix building of pdo_sqlite without sqlite3

diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index a894c207509387367de7df1a2506432e1cbde6bd..f5271108cf1ec2d1ca58d90840a500a79ea90729 100644 (file)
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -81,6 +81,10 @@ if test "$PHP_PDO_SQLITE" != "no"; then
 
       other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
 
+      if test "$PHP_SQLITE3" != "yes"; then
+        PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c)
+      fi
+
       PHP_NEW_EXTENSION(pdo_sqlite,
         $php_pdo_sqlite_sources_core,
         $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path)

diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4
deleted file mode 100644 (file)
index f9c9e54..0000000
--- a/ext/sqlite3/config.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension sqlite3
-dnl vim:et:ts=2:sw=2
-
-PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension,
-[  --without-sqlite3[=DIR] Do not include SQLite3 support. DIR is the prefix to
-                          SQLite3 installation directory.], yes)
-
-if test $PHP_SQLITE3 != "no"; then
-  sqlite3_extra_sources=""
-  PHP_SQLITE3_CFLAGS=""
-
-  dnl when running phpize enable_maintainer_zts is not available
-  if test -z "$enable_maintainer_zts"; then
-    if test -f "$phpincludedir/main/php_config.h"; then
-      ZTS=`grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//'`
-      if test "$ZTS" -eq "1"; then
-        enable_maintainer_zts="yes"
-      fi
-    fi
-  fi
-
-  if test $PHP_SQLITE3 != "yes"; then
-    AC_MSG_CHECKING([for sqlite3 files in default path])
-    for i in $PHP_SQLITE3 /usr/local /usr; do
-      if test -r $i/include/sqlite3.h; then
-        SQLITE3_DIR=$i
-        AC_MSG_RESULT(found in $i)
-        break
-      fi
-    done
-
-    if test -z "$SQLITE3_DIR"; then
-      AC_MSG_RESULT([not found])
-      AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org])
-    fi
-
-    AC_MSG_CHECKING([for SQLite 3.3.9+])
-    PHP_CHECK_LIBRARY(sqlite3, sqlite3_prepare_v2, [
-      AC_MSG_RESULT(found)
-      PHP_ADD_LIBRARY_WITH_PATH(sqlite3, $SQLITE3_DIR/$PHP_LIBDIR, SQLITE3_SHARED_LIBADD)
-      PHP_ADD_INCLUDE($SQLITE3_DIR/include)
-    ],[
-      AC_MSG_RESULT([not found])
-      AC_MSG_ERROR([Please install SQLite 3.3.9 first or check libsqlite3 is present])
-    ],[
-      -L$SQLITE3_DIR/$PHP_LIBDIR -lm
-    ])
-
-    PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[
-      AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto support])
-    ])
-
-  else
-    AC_MSG_CHECKING([bundled sqlite3 library])
-    AC_MSG_RESULT([yes])
-
-    sqlite3_extra_sources="libsqlite/sqlite3.c"
-
-    if test "$enable_maintainer_zts" = "yes"; then
-      threadsafe_flags="-DSQLITE_THREADSAFE=1"
-    else
-      threadsafe_flags="-DSQLITE_THREADSAFE=0"
-    fi
-
-    if test "$ZEND_DEBUG" = "yes"; then
-      debug_flags="-DSQLITE_DEBUG=1"
-    fi
-
-    other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_ICU=1"
-
-    PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite -I@ext_builddir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
-  fi
-
-  AC_DEFINE(HAVE_SQLITE3,1,[ ])
-
-  sqlite3_sources="sqlite3.c $sqlite3_extra_sources"
-
-  PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources, $ext_shared,,$PHP_SQLITE3_CFLAGS)
-  PHP_ADD_BUILD_DIR([$ext_builddir/libsqlite])
-  PHP_SUBST(SQLITE3_SHARED_LIBADD)
-fi