X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=bb952805d60c13a02a44bc1bf6c5f9c3c8134406;hp=be3cc4cdcff9dd9fa177fc689d420e54729376fb;hb=f512aa33473ae86f8e8efd8da749a82c398e87f0;hpb=eae04713fcef67a1f33f3120a76ab98c10dd07b1

diff --git a/configure.in b/configure.in
index be3cc4c..bb95280 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2003
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.101 2003-01-13 14:33:03 adam Exp $
+dnl $Id: configure.in,v 1.108 2003-02-18 20:21:22 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.9.2)
+AM_INIT_AUTOMAKE(yaz, 1.9.3)
 dnl
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(YAZ_CONF_CFLAGS)
@@ -17,7 +17,7 @@ AM_PROG_LIBTOOL
 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
@@ -41,7 +41,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 Docbook DSSSL in DIR/{html,print}/docbook.dsl],
 [
    if test -f "$withval/html/docbook.dsl"; then
       DSSSL_DIR=$withval
@@ -62,6 +62,27 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
       AC_MSG_RESULT(Not found)
    fi
 ])
+AC_SUBST(XSL_DIR)
+AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        use Docbook XSL in DIR/{htmlhelp,xhtml}],
+[
+   if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
+      XSL_DIR=$withval
+   fi
+],[
+   AC_MSG_CHECKING(for htmlhelp.xsl)
+   for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
+            /usr/share/sgml/docbook/xsl-stylesheets-1.* 
+   do
+     if test -f $d/htmlhelp/htmlhelp.xsl; then
+       AC_MSG_RESULT($d)
+       XSL_DIR=$d
+       break
+     fi
+   done
+   if test -z "$XSL_DIR"; then
+      AC_MSG_RESULT(Not found)
+   fi
+])
 dnl 
 dnl ----- Sockets
 checkBoth=0
@@ -78,7 +99,7 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ Open SSL
 openssl=no
-AC_ARG_WITH(openssl, [  --with-openssl[=DIR]    OpenSSL library in DIR], [openssl=$withval])
+AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
 AC_SUBST(SSL_CFLAGS)
 AC_SUBST(SSL_LIBS)
 AC_SUBST(SSL_DEFS)
@@ -142,7 +163,7 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
         LIBS=$xLIBS
 fi
 dnl ------ iconv
-AC_ARG_WITH(iconv, [  --with-iconv[=DIR]      iconv library in DIR])
+AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]   iconv library in PREFIX])
 if test "$with_iconv" != "no"; then
         AC_MSG_CHECKING(for iconv)
 	oldLIBS="$LIBS"
@@ -308,55 +329,27 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl
-dnl ----- gSOAP
-AC_SUBST(GSOAP_LIB)
-AC_SUBST(GSOAP_INCLUDE)
-AC_SUBST(GSOAP_PREFIX)
-gsoapdir=NONE
-AC_ARG_WITH(gsoap, [  --with-gsoap[=PREFIX]   Use gSOAP in PREFIX/{lib,include}],[gsoapdir=$withval])
-if test "x$gsoapdir" = "xNONE"; then
-	for d in /usr /usr/local; do
-		if test -f $d/include/stdsoap2.h; then
-			gsoapdir=$d
-		fi
-	done
-fi
-AC_MSG_CHECKING(for gSOAP prefix)
-GSOAP_PREFIX=$gsoapdir
-if test -x $gsoapdir/bin/soapcpp2; then
-	AC_MSG_RESULT($gsoapdir)
-	if test "$gsoapdir" != "/usr"; then
-		GSOAP_LIB="-L$gsoapdir/lib -lgsoap"
-		GSOAP_INCLUDE=-I$gsoapdir/include
-	fi
-        AC_DEFINE(HAVE_GSOAP)
-        usesrw=1
-else
-	AC_MSG_RESULT(Not found)
-        usesrw=0
-fi
-AM_CONDITIONAL(SRW, test $usesrw = "1")
-dnl
-dnl ----- XML/XSLT
-AC_SUBST(XSLT_LIB)
-AC_SUBST(XSLT_CFLAGS)
-xsltdir=NONE
-AC_ARG_WITH(xslt, [  --with-xslt[=PREFIX]    Use libxslt in PREFIX/{lib,include}],[xsltdir=$withval])
-if test "x$xsltdir" = "xNONE"; then
+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/xslt-config; then
-			xsltdir=$d
+		if test -x $d/bin/xml2-config; then
+			xml2dir=$d
 		fi
 	done
 fi
-if test "$usesrw" = "1"; then
-	AC_MSG_CHECKING(for XSLT)
-	if test -x $xsltdir/bin/xslt-config; then
-		XSLT_LIB=`$xsltdir/bin/xslt-config --libs`
-		XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
-		XSLT_VER=`$xsltdir/bin/xslt-config --version`
-		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE(HAVE_XSLT)
+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
@@ -384,7 +377,6 @@ yaz.spec
 util/Makefile
 odr/Makefile
 z39.50/Makefile
-srw/Makefile
 ill/Makefile
 zutil/Makefile
 comstack/Makefile
@@ -393,7 +385,6 @@ cql/Makefile
 server/Makefile
 include/Makefile
 include/yaz/Makefile
-srwapps/Makefile
 lib/Makefile
 client/Makefile
 ztest/Makefile
@@ -404,6 +395,7 @@ doc/yazhtml.dsl
 doc/yazphp.dsl
 doc/yazprint.dsl
 doc/tkl.xsl
+doc/yazhtml.xsl
 etc/Makefile
 yaz-config
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > lib/yaz-config && chmod +x yaz-config lib/yaz-config])