X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=edb04b06585422a27ecea98d89ba5680edfc3f64;hb=fe5e31a9e294669de982be03fd71990664a46476;hp=832e2c6c28192b6da053971bad39cc795856724e;hpb=96a8c2ed9ca281137d729d034312f8dceb27ee85;p=yaz-moved-to-github.git diff --git a/configure.ac b/configure.ac index 832e2c6..edb04b0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -dnl YAZ Toolkit, Index Data 1995-2007 +dnl YAZ Toolkit, Index Data 1995-2008 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.107 2008-01-17 22:27:40 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yaz],[3.0.21],[yaz-help@indexdata.dk]) +AC_INIT([yaz],[3.0.22],[yaz-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.8]) @@ -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