--- ./yaz-3.0.47.orig/configure.ac  2009-07-08 06:58:43.000000000 -0500
+++ ./yaz-3.0.47/configure.ac   2009-07-14 14:52:18.821430568 -0500
@@ -367,14 +367,14 @@

 dnl
 dnl
-AC_CHECK_ICU([3.4],[
-   if test "$xml_enabled" = "true"; then
-       ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
-   else
-       ICU_CPPFLAGS=""
-       AC_MSG_WARN([ICU support disabled because XML support is unavailable])
-   fi
-])
+dnl ------ ICU
+AC_ARG_ENABLE(icu, [  --enable-icu            enable ICU support],[enable_icu=$enableval],[enable_icu=no])
+if test "$enable_icu" = "yes"; then
+    AC_CHECK_ICU([3.4],[
+       ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"],[
+       AC_MSG_ERROR([For ICU support please install libicu34-dev or similar])
+    ])
+fi
 dnl
 dnl ------ Memory debugging
 AC_ARG_ENABLE([memdebug],[  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])