Use LIBS instead of XML2_LIBS for Makefiles

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

diff --git a/configure.in b/configure.in
index 4763db1..4555068 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2003
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.103 2003-02-12 15:06:42 adam Exp $
+dnl $Id: configure.in,v 1.107 2003-02-18 10:37:08 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.9.3)
 dnl
@@ -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 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
@@ -308,19 +329,19 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl
-dnl ----- XML/XSLT
+dnl ----- libXSLT
 AC_SUBST(XSLT_LIB)
 AC_SUBST(XSLT_CFLAGS)
-xsltdir=NONE
+xsltdir=no
 AC_ARG_WITH(xslt, [  --with-xslt[=PREFIX]    Use libxslt in PREFIX/{lib,include}],[xsltdir=$withval])
-if test "x$xsltdir" = "xNONE"; then
+if test "$xsltdir" = "yes"; then
        for d in /usr /usr/local; do
                if test -x $d/bin/xslt-config; then
                        xsltdir=$d
                fi
        done
 fi
-if true; then
+if test "$xsltdir" != "no"; then
        AC_MSG_CHECKING(for XSLT)
        if test -x $xsltdir/bin/xslt-config; then
                XSLT_LIB=`$xsltdir/bin/xslt-config --libs`
@@ -333,6 +354,32 @@ if true; then
        fi
 fi
 dnl
+dnl ----- libXML2
+AC_SUBST(XML2_LIBS)
+AC_SUBST(XML2_CFLAGS)
+xml2dir=no
+AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]    Use libxml2 in PREFIX/{lib,include}],[xml2dir=$withval])
+if test "$xml2dir" = "yes"; 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)
+       fi
+fi
+dnl
 dnl ------ Memory debugging
 AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
 if test "$enable_memdebug" = "yes"; then
@@ -373,6 +420,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])