X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=23ded0f47811d771f82ffa96cc6ce4159ceee661;hp=1d1c580840dd73929c2f3fee76a9e89324cb2b2a;hb=60fa9058b47df51d7ca169c3c75b72988d345119;hpb=bb7daed8b7299999f1c25e4e768e5e510d4b7e98

diff --git a/configure.ac b/configure.ac
index 1d1c580..23ded0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.24 2006-06-13 15:36:09 adam Exp $
+dnl $Id: configure.ac,v 1.28 2006-07-06 10:17:51 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.21],[adam@indexdata.dk])
+AC_INIT([yaz],[2.1.23],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -16,7 +16,6 @@ AC_CHECK_PROGS(YACC, 'bison -y')
 test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
 AC_CHECK_PROGS(TCLSH, tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2, tclsh)
 AC_PROG_INSTALL
-AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
 dnl
@@ -322,10 +321,30 @@ fi
 
 dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
+AC_SUBST(YAZ_CONFIG_CFLAGS)
+YAZ_CONFIG_CFLAGS=""
 
-YAZ_LIBXML2
-YAZ_LIBXSLT
-YAZ_LIBEXSLT
+YAZ_LIBXML2(
+    [
+	AC_DEFINE(YAZ_HAVE_XML2) 
+	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1"
+    ]
+)
+
+YAZ_LIBXSLT(
+    [
+	AC_DEFINE(YAZ_HAVE_XSLT)
+	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1"
+    ]
+)
+YAZ_LIBEXSLT(
+    [
+	AC_DEFINE(YAZ_HAVE_EXSLT)
+	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1"
+    ]
+)
+	
+YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS"
 
 if test "$XML2_LIBS"; then
     LIBS="$XML2_LIBS $LIBS"