X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=d1ed8241f5b410437c0dc5170e4446783fe1ad40;hp=d55af6fbfa6c43fe2ca9b11756ee8685969680a1;hb=0aad40fcb08a072aebd1dd352bc831f43d1644d7;hpb=fd3508c19a217ebd059552cc301c76d203d03524

diff --git a/configure.ac b/configure.ac
index d55af6f..d1ed824 100644
--- 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.10 2006-05-03 12:02:23 adam Exp $
+dnl $Id: configure.ac,v 1.23 2006-06-09 13:29:21 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.19],[adam@indexdata.dk])
+AC_INIT([yaz],[2.1.21],[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
@@ -46,13 +47,13 @@ AC_CHECK_FUNC(gethostbyname, ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
 dnl
 dnl ------ OpenSSL
 AC_SUBST(SSL_CFLAGS)
-openssl=no
+openssl=default
 AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
 SSL_CFLAGS=""
 SSL_LIBPATH=""
 if test "$openssl" != "no"; then
 	sslver=no
-	if test "$openssl" != "yes"; then
+	if test "$openssl" != "yes" -a "$openssl" != "default"; then
 		if test -x $openssl/bin/pkg-config; then
 			if $openssl/bin/pkg-config --exists openssl; then
 				SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
@@ -98,7 +99,9 @@ if test "$openssl" != "no"; then
 	else
 		SSL_CFLAGS=""
 		AC_MSG_RESULT([None])
-		AC_MSG_ERROR([OpenSSL development libraries missing])
+		if test "$openssl" != "default"; then
+			AC_MSG_ERROR([OpenSSL development libraries missing])
+		fi
 	fi
 fi
 dnl
@@ -317,46 +320,17 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	LIBS="$OLIBS $LIBTHREAD"
 fi
 
-dnl ----- libXSLT
-AC_SUBST(XSLT_CFLAGS)
+dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
-xsltdir=default
-AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libxslt in PREFIX]],xsltdir=$withval)
-if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
-	for d in /usr /usr/local; do
-		if test -x $d/bin/xslt-config; then
-			xsltdir=$d
-		fi
-	done
-fi
-if test "$xsltdir" != "no"; then
-	AC_MSG_CHECKING(for libXSLT)
-	if test -x $xsltdir/bin/xslt-config; then
-		XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
-		XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
-		XML2_CFLAGS=$XSLT_CFLAGS
-		XSLT_VER=`$xsltdir/bin/xslt-config --version`
-		LIBS="$XSLT_LIBS $LIBS"
-		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE(HAVE_XSLT)
-		AC_DEFINE(HAVE_XML2)
-	else
-		AC_MSG_RESULT(Not found)
 
-		if test "$xsltdir" = "default"; then
-			AC_MSG_WARN([libxslt development libraries not found.])
-			AC_MSG_WARN([YAZ will NOT support SRU.])
-		else
-		        AC_MSG_ERROR([libxslt development libraries not found.])
-		fi
-	fi
-fi
+YAZ_LIBXML2
+YAZ_LIBXSLT
+YAZ_LIBEXSLT
 
-xml2dir=default
-AC_ARG_WITH(xml2,[[  --with-xml2[=PREFIX]    OBSOLETE. Use --with-xslt instead]],xml2dir=$withval)
-if test "$xml2dir" != "default"; then
-        AC_MSG_ERROR([--with-xml2 OBSOLETE. Use --with-xslt instead.])
+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])
@@ -386,13 +360,46 @@ client/Makefile
 ztest/Makefile
 zoom/Makefile
 doc/Makefile
-doc/yaz.xml
+doc/local.ent
 doc/common/Makefile
-doc/common/html.dsl
-doc/common/html.xsl
 doc/common/print.dsl
-doc/common/tkl.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}
+
+------------------------------------------------------------------------"