Mention YAZ_DIR.

[yazpp-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index 84a7c3c..dcef686 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++",0.7.1)
+AM_INIT_AUTOMAKE("yaz++",0.8)
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -8,39 +8,11 @@ AC_HEADER_STDC
 AM_DISABLE_SHARED
 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
-
+YAZ_INIT(threads,2.0.12)
 dnl
 dnl ----- DOCBOOK DTD
 AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
+AC_ARG_WITH(dtd, [  --with-dtd[=DIR]          use docbookx.dtd in DIR],
 [
    if test -f "$withval/docbookx.dtd"; then
       DTD_DIR=$withval
@@ -64,7 +36,7 @@ AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
    fi
 ])
 AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbook.dsl],
+AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]        use DSSSL in DIR/{html,print}/docbook.dsl],
 [
    if test -f "$withval/html/docbook.dsl"; then
       DSSSL_DIR=$withval
@@ -100,9 +72,9 @@ AC_OUTPUT([
        src/Makefile
        include/Makefile
        include/yaz++/Makefile
+       zlint/Makefile
        yaz++-config
        zoom/Makefile
-       lib/Makefile
        doc/Makefile
        doc/yaz++.xml
        doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl