cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4
| From: | Scott MacVicar | Date: | Mon, 22 Dec 2008 16:43:21 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55076@lists.php.net to get a copy of this message | ||
scottmac Mon Dec 22 16:43:21 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3 config.m4
Log:
MFH Enable ICU support within bundled SQLite if intl is enabled but not shared.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.1.2.8&r2=1.1.2.9&diff_format=u
Index: php-src/ext/sqlite3/config.m4
diff -u php-src/ext/sqlite3/config.m4:1.1.2.8 php-src/ext/sqlite3/config.m4:1.1.2.9
--- php-src/ext/sqlite3/config.m4:1.1.2.8 Thu Jul 31 22:30:25 2008
+++ php-src/ext/sqlite3/config.m4 Mon Dec 22 16:43:21 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.1.2.8 2008/07/31 22:30:25 bjori Exp $
+dnl $Id: config.m4,v 1.1.2.9 2008/12/22 16:43:21 scottmac Exp $
dnl config.m4 for extension sqlite3
dnl vim:et:ts=2:sw=2
@@ -69,9 +69,11 @@
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
+ dnl As long as intl is not shared we can have ICU support
+ if test "$PHP_INTL" = "yes"; then
+ other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
+ fi
+
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags
$debug_flags"
fi