X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=304d3f19349aadd851cb05dcbb6f37b7b3867cf8;hp=7cbade396a380e6aa1cfa0360ea8b32d0c3d6b49;hb=d940392c53c32ccf76fb287cc5b997b9e921a431;hpb=46c6d34f1778ba3876412d78eb58515b423e5140

diff --git a/configure.ac b/configure.ac
index 7cbade3..304d3f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,10 @@
-dnl YAZ Toolkit, Index Data 1995-2007
-dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.103 2008-01-14 23:11:51 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yaz],[3.0.20],[yaz-help@indexdata.dk])
+dnl This file is part of the YAZ toolkit.
+dnl Copyright (C) 1995-2008 Index Data
+AC_PREREQ(2.60)
+AC_INIT([yaz],[3.0.28],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.9])
 dnl
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(YAZ_CONF_CFLAGS)
@@ -272,9 +271,6 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 fi
 dnl
 AC_SUBST(YAZ_CONFIG_CFLAGS)
-dnl
-dnl 
-AC_CHECK_ICU([3.6],[ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"])
 dnl ------ GNU threads
 HAVETHREADS=0
 AC_ARG_ENABLE(pth, [  --enable-pth            enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
@@ -322,10 +318,12 @@ fi
 dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
 
+xml_enabled=false
 YAZ_LIBXML2(
     [
 	AC_DEFINE(YAZ_HAVE_XML2) 
 	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1"
+	xml_enabled=true
     ]
 )
 
@@ -349,6 +347,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