X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=9f77f075311752b251ac7f5da71972c357640a9a;hb=c76d814c4ebc9ec7fc962c900cb4b48ed58a4f30;hp=7f727f519a3da9c397738dab03a00cbb1130121f;hpb=0f4c5842f8656d87624b8796d29eb999968c66b5;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 7f727f5..9f77f07 100644
--- a/configure.in
+++ b/configure.in
@@ -1,24 +1,11 @@
-dnl Zebra, Index Data Aps, 1994-2002
-dnl $Id: configure.in,v 1.37 2002-07-03 10:04:34 adam Exp $
+dnl Zebra, Index Data Aps, 1995-2002
+dnl $Id: configure.in,v 1.44 2002-08-29 14:04:45 mike Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AC_MSG_CHECKING(for package)
-if test -r ${srcdir}/LICENSE.zmbol; then
-	AC_MSG_RESULT([Z'mbol])
-	PROGPREFIX=zmbol
-	AC_DEFINE(ZMBOL,1)
-	AM_INIT_AUTOMAKE(zmbol,1.2.0)
-else
-	AC_MSG_RESULT([Zebra])
-	PROGPREFIX=zebra
-	AC_DEFINE(ZMBOL,0)
-	AM_INIT_AUTOMAKE(zebra,1.2.0)
-fi
-AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol)
+AM_INIT_AUTOMAKE(zebra,1.3.1)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
-AC_SUBST(PROGPREFIX)
 dnl
 dnl ------ Checking programs
 AC_PROG_CC
@@ -37,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
@@ -60,6 +48,7 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
    AC_MSG_CHECKING(for docbook.dsl)
    for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
             /usr/share/sgml/docbook/dsssl-stylesheets-1.64 \
+            /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \
             /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
    do
      if test -f $d/html/docbook.dsl; then
@@ -73,8 +62,14 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
    fi
 ])
 dnl
-YAZ_INIT(threads)
-dnl
+AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
+if test "$enable_threads" = "yes"; then
+	yazflag=threads
+else
+	yazflag=""
+fi
+YAZ_INIT($yazflag)
+
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
 dnl see if tclConfig.sh exists in same prefix lcoation as tclsh; otherwise
@@ -88,6 +83,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
@@ -114,7 +117,7 @@ else
 fi
 dnl
 dnl ------ times
-AC_CHECK_HEADERS(sys/times.h)
+AC_CHECK_HEADERS(sys/times.h iconv.h)
 dnl ------ mkstemp
 AC_CHECK_FUNCS(mkstemp)
 dnl
@@ -128,6 +131,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