cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4
| From: | Scott MacVicar | Date: | Sat, 10 Jan 2009 01:46:56 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55517@lists.php.net to get a copy of this message | ||
scottmac Sat Jan 10 01:46:56 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3 config.m4
Log:
Fix bug #47055 - When intl is shared dont enable icu support in SQLite3
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.1.2.9&r2=1.1.2.10&diff_format=u
Index: php-src/ext/sqlite3/config.m4
diff -u php-src/ext/sqlite3/config.m4:1.1.2.9 php-src/ext/sqlite3/config.m4:1.1.2.10
--- php-src/ext/sqlite3/config.m4:1.1.2.9 Mon Dec 22 16:43:21 2008
+++ php-src/ext/sqlite3/config.m4 Sat Jan 10 01:46:55 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.1.2.9 2008/12/22 16:43:21 scottmac Exp $
+dnl $Id: config.m4,v 1.1.2.10 2009/01/10 01:46:55 scottmac Exp $
dnl config.m4 for extension sqlite3
dnl vim:et:ts=2:sw=2
@@ -70,7 +70,7 @@
other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
dnl As long as intl is not shared we can have ICU support
- if test "$PHP_INTL" = "yes"; then
+ if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" !=
"yes"; then
other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
fi