Unicode support.

1 files changed, 44 insertions, 3 deletions

diff --git a/configure.in b/configure.in
index 3c5bfc63a0..cc6bd0aad1 100644
--- a/configure.in
+++ b/configure.in
@@ -378,7 +378,8 @@ unix.h \
 utime.h \
 sys/utsname.h \
 sys/ipc.h \
-dlfcn.h
+dlfcn.h \
+assert.h
 ],[],[],[
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -763,6 +764,46 @@ AC_ARG_ENABLE(versioning,
 ])
 AC_MSG_RESULT([$PHP_VERSIONING])
 
+dnl ## check for ICU library location
+dnl ## until we bundle it
+PHP_ARG_WITH(icu-dir,[location of ICU headers and libraries],
+[  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found], DEFAULT, no)
+if test "$PHP_ICU_DIR" = "DEFAULT"; then
+    AC_MSG_CHECKING(for ICU in default path)
+    for i in /usr/local /usr; do
+      if test -r $i/include/unicode/utypes.h; then
+        ICU_DIR=$i
+        AC_MSG_RESULT(found in $i)
+        break
+      fi
+    done
+else
+	if test -f $PHP_ICU_DIR/include/unicode/utypes.h; then
+        ICU_DIR=$PHP_ICU_DIR
+	fi
+fi
+if test -z "$ICU_DIR"; then
+    AC_MSG_RESULT(not found)
+	AC_MSG_ERROR(Please specify where ICU libraries and header file are located)
+fi
+ICU_CONFIG="icu-config"
+if ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
+	ICU_CONFIG=${ICU_DIR}/bin/icu-config
+fi
+AC_MSG_CHECKING(for ICU 3.4 or greater)
+icu_version_full=`$ICU_CONFIG --version`
+icu_version=`echo ${icu_version_full} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) ;}'`
+if test "$icu_version" -ge 3004; then
+  AC_MSG_RESULT($icu_version_full found)
+  ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+else
+  AC_MSG_ERROR(ICU version 3.4 or later is required, $icu_full_version found)
+fi
+PHP_ADD_INCLUDE($ICU_DIR/include)
+PHP_EVAL_LIBLINE($ICU_LIBS, ICU_SHARED_LIBADD)
+PHP_SUBST(ICU_SHARED_LIBADD)
+
+
 divert(5)
 
 dnl ## In diversion 5 we check which extensions should be compiled.
@@ -1229,12 +1270,12 @@ PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \
 
 PHP_ADD_SOURCES(Zend, \
     zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
-    zend_execute_API.c zend_highlight.c zend_llist.c \
+    zend_execute_API.c zend_unicode.c zend_highlight.c zend_llist.c \
     zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
     zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
     zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
-    zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c)
+    zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_strtol.c)
 
 if test -r "$abs_srcdir/Zend/zend_objects.c"; then
   PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_mm.c \