jani Sat Jul 26 22:11:42 2008 UTC
Modified files:
/php-src/ext/sqlite3 config.m4
Log:
- No tabs.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sqlite3/config.m4
diff -u php-src/ext/sqlite3/config.m4:1.2 php-src/ext/sqlite3/config.m4:1.3
--- php-src/ext/sqlite3/config.m4:1.2 Sat Jul 26 01:23:45 2008
+++ php-src/ext/sqlite3/config.m4 Sat Jul 26 22:11:41 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.2 2008/07/26 01:23:45 scottmac Exp $
+dnl $Id: config.m4,v 1.3 2008/07/26 22:11:41 jani Exp $
dnl config.m4 for extension sqlite3
dnl vim:et:ts=2:sw=2
@@ -7,80 +7,80 @@
SQLite3 installation directory.], no)
if test $PHP_SQLITE3 != "no"; then
- sqlite3_extra_sources=""
- PHP_SQLITE3_CFLAGS=""
+ 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([built in 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"
-
-dnl if test "$PHP_MAJOR_VERSION" -ge "6"; then
-dnl other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
-dnl fi
-
- PHP_SQLITE3_CFLAGS="[EMAIL PROTECTED]@/libsqlite [EMAIL
PROTECTED]@/libsqlite $other_flags $threadsafe_flags $debug_flags"
- fi
+ 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"
+
+dnl if test "$PHP_MAJOR_VERSION" -ge "6"; then
+dnl other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
+dnl fi
+
+ PHP_SQLITE3_CFLAGS="[EMAIL PROTECTED]@/libsqlite [EMAIL
PROTECTED]@/libsqlite $other_flags $threadsafe_flags $debug_flags"
+ fi
- AC_DEFINE(HAVE_SQLITE3,1,[ ])
+ AC_DEFINE(HAVE_SQLITE3,1,[ ])
- sqlite3_sources="sqlite3.c $sqlite3_extra_sources"
+ sqlite3_sources="sqlite3.c $sqlite3_extra_sources"
- PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources, $ext_shared,
,$PHP_SQLITE3_CFLAGS)
- PHP_SUBST(SQLITE3_SHARED_LIBADD)
+ PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources,
$ext_shared,,$PHP_SQLITE3_CFLAGS)
+ PHP_SUBST(SQLITE3_SHARED_LIBADD)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
