X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=334980eec32af2bf9a5513baa001433f751d3b68;hb=c36658ab15443afe397ccfc87f14ad11dfcc0e80;hp=45d256cc8a56039f4cb65117b640f03befcfc989;hpb=3cddca8f4cb93fc50fadfafdae4856203b7905ff;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 45d256c..334980e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1995-2002
-dnl $Id: configure.in,v 1.41 2002-08-23 13:42:59 adam Exp $
+dnl $Id: configure.in,v 1.43 2002-08-28 20:58:13 mike Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AM_INIT_AUTOMAKE(zebra,1.3.1)
@@ -24,6 +24,7 @@ AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
    AC_MSG_CHECKING(for docbookx.dtd)
    for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
          /usr/share/sgml/docbook/xml-dtd-4.1.2 \
+         /usr/share/sgml/docbook/xml-dtd-4.1 \
          /usr/share/sgml/docbook/dtd/xml/4.0 \
 	    /usr/lib/sgml/dtd/docbook-xml 
    do
@@ -81,6 +82,14 @@ if test "x$tclconfig" = xNONE; then
 	AC_PREFIX_PROGRAM(tclsh)
 	tclconfig=${prefix}/lib
 	prefix=${saveprefix}
+	if test ! -r ${tclconfig}/tclConfig.sh; then
+		# Not found, try search for Tcl on Debian systems.
+		for d in /usr/lib/tcl*; do
+			if test -d $d; then
+				tclconfig=$d
+			fi
+		done
+	fi
 fi
 AC_MSG_CHECKING(for Tcl)
 if test -r ${tclconfig}/tclConfig.sh; then
@@ -121,6 +130,27 @@ else
 		AC_CHECK_HEADERS(bzlib.h)
 	fi
 fi
+dnl
+dnl ------ EXPAT
+expat=yes
+AC_ARG_WITH(expat,   [  --with-expat[=DIR]      EXPAT library in DIR],[expat=$withval])
+if test "$expat" != "no"; then
+	xLIBS="$LIBS";
+	xCFLAGS="$CFLAGS";
+	if test "$expat" != "yes"; then
+                EXPAT_CFLAGS="-I$expat/include"
+                EXPAT_LIBS="-L$expat/lib"
+		CFLAGS="$EXPAT_CFLAGS $CFLAGS"
+		LIBS="$EXPAT_LIBS $LIBS"
+	fi
+	AC_CHECK_LIB(expat,XML_ParserCreate,[LIBS="$LIBS -lexpat"])
+	if test "$ac_cv_lib_expat_XML_ParserCreate" = "yes"; then
+		AC_CHECK_HEADERS(expat.h)
+	else
+		LIBS="$xLIBS"
+		CFLAGS="$xCFLAGS"
+	fi
+fi
 dnl ------- 64 bit files
 AC_MSG_CHECKING(for LFS)
 AC_TRY_RUN([#define _FILE_OFFSET_BITS 64