Update headers and omit CVS Ids.

[yaz-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 832e2c6..304d3f1 100644 (file)
--- 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.105 2008-01-16 12:17:26 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yaz],[3.0.21],[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,16 +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],[
-       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 +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