X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=84a7c3c94bc7e7f53f8759a1c091717d33eda140;hb=550c148a623dd9c4dee6f2b065fba884785c61be;hp=7e5e35f4b0f666add23a5f770d4e8cf2f9633280;hpb=2f83e1ab14eab55ce68001e48c5808193ef6bf77;p=yazpp-moved-to-github.git

diff --git a/configure.in b/configure.in
index 7e5e35f..84a7c3c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++",0.5)
+AM_INIT_AUTOMAKE("yaz++",0.7.1)
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -11,6 +11,33 @@ AM_PROG_LIBTOOL
 YAZ_INIT(threads)
 
 dnl
+dnl ----- libXML2
+AC_SUBST(XML2_LIBS)
+AC_SUBST(XML2_CFLAGS)
+xml2dir=yes
+AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]    use libxml2 in PREFIX],[xml2dir=$withval])
+if test "$xml2dir" = "yes"; then
+	for d in /usr /usr/local; do
+		if test -x $d/bin/xml2-config; then
+			xml2dir=$d
+		fi
+	done
+fi
+if test "$xml2dir" != "no"; then
+	AC_MSG_CHECKING(for libXML2)
+	if test -x $xml2dir/bin/xml2-config; then
+		XML2_LIBS=`$xml2dir/bin/xml2-config --libs`
+		LIBS="$XML2_LIBS $LIBS"
+		XML2_CFLAGS=`$xml2dir/bin/xml2-config --cflags`
+		XML2_VER=`$xml2dir/bin/xml2-config --version`
+		AC_MSG_RESULT($XML2_VER)
+		AC_DEFINE(HAVE_XML2)
+	else
+		AC_MSG_RESULT(Not found)
+	fi
+fi
+
+dnl
 dnl ----- DOCBOOK DTD
 AC_SUBST(DTD_DIR)
 AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
@@ -60,6 +87,8 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
 ])
 dnl 
 
+AC_ARG_ENABLE(zoom,[  --disable-zoom          disable ZOOM (for old C++ compilers)],[enable_zoom=$enableval],[enable_zoom=yes])
+AM_CONDITIONAL(ZOOM, test $enable_zoom = "yes")
 
 AC_SUBST(YAZPP_SRC_ROOT)
 AC_SUBST(YAZPP_BUILD_ROOT)