Fixed order of declarations

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

diff --git a/configure.ac b/configure.ac
index 684b43a..23ded0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.27 2006-06-27 12:23:11 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.23],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -321,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"