X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=05517add12c0f5c58adb78c378ec04419a9946e9;hb=b0e80dcddb94c00391505d78f2f79b42469af14e;hp=6d6538b380bb2065ff07ecc226b08978b00d3731;hpb=b4554e2111b1b0001d4184ba3e307bfb1001b337;p=yazpp-moved-to-github.git

diff --git a/configure.in b/configure.in
index 6d6538b..05517ad 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++",0.4)
+AM_INIT_AUTOMAKE("yaz++",0.7.2)
 
 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,26 +87,25 @@ 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)
 YAZPP_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZPP_BUILD_ROOT=`pwd`
 
-if test -f ${srcdir}/src/yaz++-config.in; then
-        rm ${srcdir}/src/yaz++-config.in
-fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz++-config.in >${srcdir}/src/yaz++-config.in
 AC_OUTPUT([
 	Makefile
 	src/Makefile
 	include/Makefile
 	include/yaz++/Makefile
 	yaz++-config
-	src/yaz++-config
 	zoom/Makefile
 	lib/Makefile
 	doc/Makefile
 	doc/yaz++.xml
 	doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl
-],[chmod +x yaz++-config src/yaz++-config])
+        doc/tkl.xsl
+	etc/Makefile
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz++-config >src/yaz++-config && chmod +x yaz++-config src/yaz++-config])