From: Scott MacVicar <scottmac@php.net>
Date: Mon, 22 Dec 2008 16:43:21 +0000 (+0000)
Subject: MFH Enable ICU support within bundled SQLite if intl is enabled but not shared.
X-Git-Tag: php-5.3.0beta1~394
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=178e0c726ec914aee10aeab612c061d4d0706d7b;p=php

MFH Enable ICU support within bundled SQLite if intl is enabled but not shared.
---

diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4
index 4b080d2817..e71c17dd36 100644
--- a/ext/sqlite3/config.m4
+++ b/ext/sqlite3/config.m4
@@ -69,9 +69,11 @@ if test $PHP_SQLITE3 != "no"; then
 
     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
 
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index 4b080d2817..e71c17dd36 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -69,9 +69,11 @@ if test $PHP_SQLITE3 != "no"; then
 
     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