X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=fce4b05cacc7755b106ea556f7b375399a65ec0b;hp=c2820e43f55198185042c1c78ee1a67fa8fd4e60;hb=471c6dccdbb5c5a9c08b24c9abd6a1dcda29e79e;hpb=0b20fc2dcafe8d56501a3b34626b3174c60eefb5

diff --git a/configure.ac b/configure.ac
index c2820e4..fce4b05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.11 2006-05-08 10:16:46 adam 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.19],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -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
@@ -320,127 +321,9 @@ fi
 dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
 
-xml2dir=default
-AC_ARG_WITH(xml2,[[  --with-xml2[=PREFIX]    use libxml2 in PREFIX]],xml2dir=$withval)
-dnl -- if no PREFIX or not specified we just search in default locations
-dnl -- try pkg-config. If not found, use xml2-config
-if test "$xml2dir" = "yes" -o "$xml2dir" = "default"; then
-	if test "$pkgconfigpath" != "NONE"; then
-		if $pkgconfigpath --exists libxml-2.0; then
-			pkgmodule="libxml-2.0"
-		fi
-	fi
-	if test -z "$pkgmodule"; then
-		for d in /usr /usr/local; do
-			if test -x $d/bin/xml2-config; then
-				xml2dir=$d
-			fi
-		done
-	fi
-fi
-dnl --- do the real check (pkg-config, xml2-config, not-found)
-if test "$xml2dir" != "no"; then
-	AC_MSG_CHECKING(for libXML2)
-	if test "$pkgmodule"; then
-		XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
-		XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
-		XML2_VER=`$pkgconfigpath --modversion $pkgmodule`
-		AC_MSG_RESULT($XML2_VER)
-		AC_DEFINE(HAVE_XML2)
-	elif test -x $xml2dir/bin/xml2-config; then
-		XML2_LIBS=`$xml2dir/bin/xml2-config --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 SRU.])
-		else
-		        AC_MSG_ERROR([libxml2 development libraries not found.])
-		fi
-	fi
-fi
-
-dnl ----- libXSLT
-xsltdir=default
-pkgmodule=""
-AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libXSLT in PREFIX]],xsltdir=$withval)
-
-dnl -- if no PREFIX or not specified we just search in default locations
-dnl -- try pkg-config. If not found, use xslt-config
-if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
-	if test "$pkgconfigpath" != "NONE"; then
-		if $pkgconfigpath --exists libxslt; then
-			pkgmodule="libxslt"
-		fi
-	fi
-	if test -z "$pkgmodule"; then
-		for d in /usr /usr/local; do
-			if test -x $d/bin/xslt-config; then
-				xsltdir=$d
-			fi
-		done
-	fi
-fi
-dnl --- do the real check (pkg-config, xslt-config, not-found)
-if test "$xsltdir" != "no"; then
-	AC_MSG_CHECKING(for libXSLT)
-	if test "$pkgmodule"; then
-		XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
-		XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
-		XSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
-		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE(HAVE_XSLT)
-	elif test -x $xsltdir/bin/xslt-config; then
-		XML2_LIBS=`$xsltdir/bin/xslt-config --libs`
-		XML2_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
-		XSLT_VER=`$xsltdir/bin/xslt-config --version`
-		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE(HAVE_XSLT)
-	else
-		AC_MSG_RESULT(Not found)
-
-		if test "$xsltdir" = "default"; then
-			AC_MSG_WARN([libXSLT development libraries not found.])
-		else
-		        AC_MSG_ERROR([libXSLT development libraries not found.])
-		fi
-	fi
-fi
-
-dnl -- get libEXSLT. xslt-config is no good. So use pkg-config only
-exsltdir=default
-pkgmodule=""
-AC_ARG_WITH(exslt,[[  --with-exslt[=PREFIX]   use libEXSLT in PREFIX]],exsltdir=$withval)
-if test "$exsltdir" = "yes" -o "$exsltdir" = "default"; then
-	if test "$pkgconfigpath" != "NONE"; then
-		if $pkgconfigpath --exists libexslt; then
-			pkgmodule="libexslt"
-		fi
-	fi
-fi
-if test "$exsltdir" != "no"; then
-	AC_MSG_CHECKING(for libEXSLT)
-	if test "$pkgmodule"; then
-		XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
-		XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
-		EXSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
-		AC_MSG_RESULT($EXSLT_VER)
-		AC_DEFINE(HAVE_EXSLT)
-	else
-		AC_MSG_RESULT(Not found)
-
-		if test "$exsltdir" = "default"; then
-			AC_MSG_WARN([libEXSLT development libraries not found.])
-		else
-		        AC_MSG_ERROR([libEXSLT development libraries not found.])
-		fi
-	fi
-fi
+YAZ_LIBXML2
+YAZ_LIBXSLT
+YAZ_LIBEXSLT
 
 if test "$XML2_LIBS"; then
 	LIBS="$XML2_LIBS $LIBS"
@@ -481,7 +364,44 @@ 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}
+
+------------------------------------------------------------------------"