cleanup

diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4
index 2069132a7e88039faae477fc27f921900730d0d0..3b44552e944694ed72511efc739d0fd3da975ce3 100644 (file)
--- a/ext/sqlite/config.m4
+++ b/ext/sqlite/config.m4
@@ -2,78 +2,68 @@ dnl $Id$
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
-PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: ISO-8859-1),
-[  --enable-sqlite-utf8    Enable UTF-8 support for SQLite], no, no)
-
 PHP_ARG_WITH(sqlite, for sqlite support,
 [  --without-sqlite      Do not include sqlite support.
                           Use --with-sqlite=DIR to specify DIR where
                           Sqlite include and library files are located,
                           if not using bundled library.], yes)
 
+PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: ISO-8859-1),
+[  --enable-sqlite-utf8    Enable UTF-8 support for SQLite], no, no)
+
 if test "$PHP_SQLITE" != "no"; then
- if test "$PHP_PDO" != "no"; then
-  AC_MSG_CHECKING([for PDO includes])
-  if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
-    pdo_inc_path=$abs_srcdir/ext
-  elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-    pdo_inc_path=$abs_srcdir/ext
-  elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-    pdo_inc_path=$prefix/include/php/ext
-  else
-    AC_MSG_WARN([Cannot find php_pdo_driver.h.])
-    pdo_inc_path=""
-  fi
-  if test -n "$pdo_inc_path"; then
-    AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
-    pdo_inc_path="-I$pdo_inc_path"
-  fi
-  AC_MSG_RESULT($pdo_inc_path)
- fi  
+  if test "$PHP_PDO" != "no"; then
+    AC_MSG_CHECKING([for PDO includes])
+    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+      pdo_inc_path=$abs_srcdir/ext
+    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+      pdo_inc_path=$abs_srcdir/ext
+    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+      pdo_inc_path=$prefix/include/php/ext
+    else
+      AC_MSG_WARN([Cannot find php_pdo_driver.h.])
+    fi
+    if test -n "$pdo_inc_path"; then
+      AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
+      pdo_inc_path="-I$pdo_inc_path"
+    fi
+    AC_MSG_RESULT([$pdo_inc_path])
+  fi  
 
   if test "$PHP_SQLITE" != "yes"; then
     SEARCH_PATH="/usr/local /usr"
     SEARCH_FOR="/include/sqlite.h"
     if test -r $PHP_SQLITE/; then # path given as parameter
-        SQLITE_DIR=$PHP_SQLITE
+      SQLITE_DIR=$PHP_SQLITE
     else # search default path list
-        AC_MSG_CHECKING([for sqlite files in default path])
-        for i in $SEARCH_PATH ; do
+      AC_MSG_CHECKING([for sqlite files in default path])
+      for i in $SEARCH_PATH ; do
         if test -r $i/$SEARCH_FOR; then
-            SQLITE_DIR=$i
-            AC_MSG_RESULT(found in $i)
+          SQLITE_DIR=$i
+          AC_MSG_RESULT(found in $i)
         fi
-        done
+      done
     fi
   
     if test -z "$SQLITE_DIR"; then
-        AC_MSG_RESULT([not found])
-        AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org])
+      AC_MSG_RESULT([not found])
+      AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org])
     fi
 
-    PHP_ADD_INCLUDE($SQLITE_DIR/include)
-
-    LIBNAME=sqlite
-    LIBSYMBOL=sqlite_open
-
-    PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
-    [
-        PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/$PHP_LIBDIR, SQLITE_SHARED_LIBADD)
-        AC_DEFINE(HAVE_SQLITELIB,1,[ ])
+    PHP_CHECK_LIBRARY(sqlite, sqlite_open, [
+      PHP_ADD_LIBRARY_WITH_PATH(sqlite, $SQLITE_DIR/$PHP_LIBDIR, SQLITE_SHARED_LIBADD)
+      PHP_ADD_INCLUDE($SQLITE_DIR/include)
     ],[
-        AC_MSG_ERROR([wrong sqlite lib version or lib not found])
+      AC_MSG_ERROR([wrong sqlite lib version or lib not found])
     ],[
-        -L$SQLITE_DIR/$PHP_LIBDIR -lm
+      -L$SQLITE_DIR/$PHP_LIBDIR -lm
     ])
- 
-    PHP_SUBST(SQLITE_SHARED_LIBADD)
-    PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c pdo_sqlite2.c libsqlite/src/encode.c, $ext_shared,,$pdo_inc_path)
+    PHP_SQLITE_CFLAGS=$pdo_inc_path
+    sqlite_extra_sources="libsqlite/src/encode.c"
   else
     # use bundled library
-
     PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src $pdo_inc_path"
-
-    sources="libsqlite/src/opcodes.c
+    sqlite_extra_sources="libsqlite/src/opcodes.c \
         libsqlite/src/parse.c libsqlite/src/encode.c \
         libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
         libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
@@ -87,30 +77,29 @@ if test "$PHP_SQLITE" != "no"; then
         libsqlite/src/vdbeaux.c libsqlite/src/date.c \
         libsqlite/src/where.c libsqlite/src/trigger.c"
     
-    PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c pdo_sqlite2.c $sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
     PHP_ADD_EXTENSION_DEP(sqlite, spl)
     PHP_ADD_EXTENSION_DEP(sqlite, pdo)
     PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
     PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
-    AC_CHECK_SIZEOF(char *,4)
+    AC_CHECK_SIZEOF(char *, 4)
     AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
     dnl use latin 1 for SQLite older than 2.8.9; the utf-8 handling 
     dnl in funcs.c uses assert(), which is a bit silly and something 
     dnl we want to avoid. This assert() was removed in SQLite 2.8.9.
     if test "$PHP_SQLITE_UTF8" = "yes"; then
-        SQLITE_ENCODING="UTF8"
-        AC_DEFINE(SQLITE_UTF8, 1, [ ])
+      SQLITE_ENCODING="UTF8"
+      AC_DEFINE(SQLITE_UTF8, 1, [ ])
     else
-        SQLITE_ENCODING="ISO8859"
+      SQLITE_ENCODING="ISO8859"
     fi
     PHP_SUBST(SQLITE_ENCODING)
 
     SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
     PHP_SUBST(SQLITE_VERSION)
-       
+
     sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in >$ext_srcdir/libsqlite/src/sqlite.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/libsqlite/src/config.h
     else
       echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
@@ -124,9 +113,15 @@ if test "$PHP_SQLITE" != "no"; then
 # define NDEBUG
 #endif
 EOF
-
   fi
 
+  dnl
+  dnl Common for both bundled/external
+  dnl
+  sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" 
+  PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
+  PHP_SUBST(SQLITE_SHARED_LIBADD)
+
   AC_CHECK_FUNCS(usleep nanosleep)
   AC_CHECK_HEADERS(time.h)
 fi