From: Adam Dickmeiss Date: Wed, 16 Jan 2008 12:47:18 +0000 (+0000) Subject: Check ICU after Libxml2 availability X-Git-Tag: YAZ.3.0.22.x~8 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=55119209417d079125b94c4a708cdc0efa0a7446;p=yaz-moved-to-github.git Check ICU after Libxml2 availability --- diff --git a/configure.ac b/configure.ac index 832e2c6..3e51511 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1995-2007 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.105 2008-01-16 12:17:26 adam Exp $ +dnl $Id: configure.ac,v 1.106 2008-01-16 12:47:18 adam Exp $ AC_PREREQ(2.59) AC_INIT([yaz],[3.0.21],[yaz-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) @@ -272,16 +272,6 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then fi dnl AC_SUBST(YAZ_CONFIG_CFLAGS) -dnl -dnl -AC_CHECK_ICU([3.6],[ - 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 ------ GNU threads HAVETHREADS=0 AC_ARG_ENABLE(pth, [ --enable-pth enable GNU threads],[enable_pth=$enableval],[enable_pth=no]) @@ -358,6 +348,16 @@ if test "$XML2_LIBS"; then fi dnl +dnl +AC_CHECK_ICU([3.6],[ + 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 dnl ------ Memory debugging AC_ARG_ENABLE(memdebug, [ --enable-memdebug enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none]) if test "$enable_memdebug" = "yes"; then