Create PHP_SETUP_ICU macro that can be used in self-contained

extensions.

diff --git a/acinclude.m4 b/acinclude.m4
index 78ef171e2f15106a9decf67a93c485b7e318daa0..49db9be961e5aea40115e705631ffd3341af0d7d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2085,6 +2085,69 @@ dnl -------------------------------------------------------------------------
 dnl Common setup macros: PHP_SETUP_<what>
 dnl -------------------------------------------------------------------------
 
+dnl
+dnl PHP_SETUP_ICU([shared-add])
+dnl
+dnl Common setup macro for kerberos
+dnl
+AC_DEFUN([PHP_SETUP_ICU],[
+  unset PHP_ICU_DIR
+
+  AC_MSG_CHECKING([for location of ICU headers and libraries])
+
+  AC_ARG_WITH(icu-dir,
+  [  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found], 
+  [
+       if test "x$withval" != "xyes"; then
+         PHP_ICU_DIR=$withval
+       else
+         PHP_ICU_DIR=DEFAULT
+       fi
+  ], [
+       PHP_ICU_DIR=DEFAULT
+  ])
+
+  if test "$PHP_ICU_DIR" = "DEFAULT"; then
+       ICU_CONFIG=icu-config
+       for i in /usr/local/bin /usr/bin; do
+         if test -x "$i/icu-config"; then
+               ICU_CONFIG=$i/icu-config
+               break;
+         fi
+       done
+  else
+       ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
+  fi
+
+  dnl Trust icu-config to know better what the install prefix is..
+  icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
+  if test -z "$icu_install_prefix"; then
+    AC_MSG_RESULT([not found])
+    AC_MSG_ERROR([Please specify the correct ICU install prefix.])
+  else
+    AC_MSG_RESULT([found in $icu_install_prefix])
+
+       dnl Check ICU version
+       AC_MSG_CHECKING([for ICU 3.4 or greater])
+       icu_version_full=`$ICU_CONFIG --version`
+       ac_IFS=$IFS
+       IFS="."
+       set $icu_version_full
+       IFS=$ac_IFS
+       icu_version=`expr [$]1 \* 1000 + [$]2`
+       AC_MSG_RESULT([found $icu_version_full])
+       if test "$icu_version" -lt "3004"; then
+         AC_MSG_ERROR([ICU version 3.4 or later is required])
+       fi
+
+       ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
+       ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+       PHP_EVAL_INCLINE($ICU_INCS)
+       PHP_EVAL_LIBLINE($ICU_LIBS, $1)
+  fi
+])
+
+
 dnl
 dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]])
 dnl

diff --git a/configure.in b/configure.in
index a60f2880280c177135cac6dd826f05cc37889c96..4e7768d246c294b5c1b157a6e87d87b0dc337e7b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -815,58 +815,8 @@ AC_ARG_ENABLE(versioning,
 ])
 AC_MSG_RESULT([$PHP_VERSIONING])
 
-dnl ## check for ICU library location
-AC_MSG_CHECKING([for location of ICU headers and libraries])
-AC_ARG_WITH(icu-dir,
-[  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found], 
-[
-  if test "x$withval" != "xyes"; then
-    PHP_ICU_DIR=$withval
-  else
-    PHP_ICU_DIR=DEFAULT
-  fi
-], [
-  PHP_ICU_DIR=DEFAULT
-])
-
-if test "$PHP_ICU_DIR" = "DEFAULT"; then
-  ICU_CONFIG=icu-config
-  for i in /usr/local/bin /usr/bin; do
-    if test -x "$i/icu-config"; then
-      ICU_CONFIG=$i/icu-config
-      break;
-    fi
-  done
-else
-  ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
-fi
-
-dnl Trust icu-config to know better what the install prefix is..
-icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
-if test -z "$icu_install_prefix"; then
-  AC_MSG_RESULT([not found])
-  AC_MSG_ERROR([Please specify the correct ICU install prefix.])
-else
-  AC_MSG_RESULT([found in $icu_install_prefix])
-
-  dnl Check ICU version
-  AC_MSG_CHECKING([for ICU 3.4 or greater])
-  icu_version_full=`$ICU_CONFIG --version`
-  ac_IFS=$IFS
-  IFS="."
-  set $icu_version_full
-  IFS=$ac_IFS
-  icu_version=`expr [$]1 \* 1000 + [$]2`
-  AC_MSG_RESULT([found $icu_version_full])
-  if test "$icu_version" -lt "3004"; then
-    AC_MSG_ERROR([ICU version 3.4 or later is required])
-  fi
-
-  ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
-  ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
-  PHP_EVAL_INCLINE($ICU_INCS)
-  PHP_EVAL_LIBLINE($ICU_LIBS)
-fi
+dnl ## check for ICU library location and version
+PHP_SETUP_ICU
 
 divert(5)