Revert

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

diff --git a/configure.ac b/configure.ac
index 64e693a..fce4b05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.7 2006-04-20 08:38:01 marc Exp $
+dnl $Id: configure.ac,v 1.18 2006-05-24 16:21:02 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.18],[adam@indexdata.dk])
+AC_INIT([yaz],[2.1.19],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -14,6 +14,7 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_CHECK_PROGS(YACC, 'bison -y')
 test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
+AC_CHECK_PROGS(TCLSH, tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2, tclsh)
 AC_PROG_INSTALL
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
@@ -316,38 +317,18 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
        CC=$OCC
        LIBS="$OLIBS $LIBTHREAD"
 fi
-dnl
-dnl ----- libXML2
-AC_SUBST(XML2_LIBS)
+
+dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
-xml2dir=default
-AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]      use libxml2 in PREFIX],[xml2dir=$withval])
-if test "$xml2dir" = "yes" -o "$xml2dir" = "default"; 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])
-               if test "$xml2dir" = "default"; then
-                       AC_MSG_WARN([Libxml2 development libraries not found.])
-                       AC_MSG_WARN([YAZ will NOT support SRW/SRU.])
-               else
-                       AC_MSG_ERROR([libXML2 development libraries not found.])
-               fi
-       fi
+
+YAZ_LIBXML2
+YAZ_LIBXSLT
+YAZ_LIBEXSLT
+
+if test "$XML2_LIBS"; then
+       LIBS="$XML2_LIBS $LIBS"
 fi
+
 dnl
 dnl ------ Memory debugging
 AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
@@ -378,11 +359,49 @@ ztest/Makefile
 zoom/Makefile
 doc/Makefile
 doc/yaz.xml
-doc/yazhtml.dsl
-doc/yazprint.dsl
-doc/tkl.xsl
-doc/yazhtml.xsl
+doc/common/Makefile
+doc/common/html.dsl
+doc/common/html.xsl
+doc/common/print.dsl
+doc/common/tkl.xsl
+doc/common/man.xsl
 etc/Makefile
 yaz-config
 Doxyfile
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])
+
+
+echo \ '
+Build and install binaries with the usual
+  make
+  make check
+  make install
+
+Build distribution tarball with
+  make dist
+
+Verify distribution tarball with
+  make distcheck
+'
+
+echo \
+"------------------------------------------------------------------------
+Configuration:
+
+  YAZ Package:                ${PACKAGE}
+  YAZ Version:                ${VERSION}
+  Bugreport:                  ${PACKAGE_BUGREPORT}
+  Source code location:       ${srcdir}
+  C Preprocessor:             ${CPP}
+  C Preprocessor flags:       ${CPPFLAGS}
+  C Compiler:                 ${CC}
+  C Compiler flags:           ${CFLAGS}
+  Linker flags:               ${LDFLAGS}
+  Linked libs:                ${LIBS}
+  Host System Type:           ${host}
+  Install path:               ${prefix}
+  Automake:                   ${AUTOMAKE}
+  Archiver:                   ${AR}
+  Ranlib:                     ${RANLIB}
+
+------------------------------------------------------------------------"