Updates for yaz/ylog.h

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

diff --git a/configure.in b/configure.in
index 42a6ad4..8834f7a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++", 0.3)
+AM_INIT_AUTOMAKE("yaz++",0.8)
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -8,77 +8,27 @@ AC_HEADER_STDC
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
-YAZ_INIT(threads)
-
-dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbookx.dtd)
-   for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
-         /usr/share/sgml/docbook/xml-dtd-4.1.2* \
-         /usr/share/sgml/docbook/xml-dtd-4.1 \
-         /usr/share/sgml/docbook/dtd/xml/4.0 \
-           /usr/lib/sgml/dtd/docbook-xml 
-   do
-     if test -f $d/docbookx.dtd; then
-       AC_MSG_RESULT($d)
-       DTD_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DTD_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(DSSSL_DIR)
-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
-   fi
-],[
-   AC_MSG_CHECKING(for docbook.dsl)
-   for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
-            /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
-   do
-     if test -f $d/html/docbook.dsl; then
-       AC_MSG_RESULT($d)
-       DSSSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DSSSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-dnl 
+YAZ_INIT(threads,2.0.29)
+YAZ_DOC
 
+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
+       zlint/Makefile
        yaz++-config
-       src/yaz++-config
        zoom/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
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz++-config >src/yaz++-config && chmod +x yaz++-config src/yaz++-config])