X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=58cd24b2bd4a57627867fe9190f324c499be9f8b;hb=4e68a651c499e3acc77fbf2dbedd294855206f00;hp=e1d59d6fb0b7558476314bb4d464893a03a61668;hpb=33ca955198b19dbf989edfeda20922628d183943;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index e1d59d6..58cd24b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Zebra, Index Data Aps, 1995-2002
-dnl $Id: configure.in,v 1.40 2002-08-20 12:01:00 adam Exp $
+dnl $Id: configure.in,v 1.55 2002-11-09 22:26:19 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(zebra,1.3.1)
+AM_INIT_AUTOMAKE(idzebra,1.3.3)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -23,7 +23,8 @@ 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.2* \
+         /usr/share/sgml/docbook/xml-dtd-4.1 \
          /usr/share/sgml/docbook/dtd/xml/4.0 \
 	    /usr/lib/sgml/dtd/docbook-xml 
    do
@@ -46,7 +47,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.* \
             /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
    do
      if test -f $d/html/docbook.dsl; then
@@ -60,8 +61,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
@@ -75,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 -f $d/tclConfig.sh; then
+				tclconfig=$d
+			fi
+		done
+	fi
 fi
 AC_MSG_CHECKING(for Tcl)
 if test -r ${tclconfig}/tclConfig.sh; then
@@ -101,10 +116,45 @@ else
 fi
 dnl
 dnl ------ times
-AC_CHECK_HEADERS(sys/times.h iconv.h)
+AC_CHECK_HEADERS(sys/times.h)
+dnl
 dnl ------ mkstemp
 AC_CHECK_FUNCS(mkstemp)
 dnl
+dnl ------ iconv
+AC_ARG_WITH(iconv, [  --with-iconv[=DIR]      iconv library in DIR])
+if test "$with_iconv" != "no"; then
+	AC_MSG_CHECKING(for iconv)
+	oldLIBS="$LIBS"
+	oldCPPFLAGS="${CPPFLAGS}"
+	if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then
+		LIBS="$LIBS -L${with_iconv}/lib"
+		CPPFLAGS="${CPPFLAGS} -I${with_iconv}/include"
+	fi
+	AC_TRY_LINK([
+		#include <iconv.h>
+	],[
+		static void f() {iconv_t t = iconv_open("", ""); }
+	],[
+		AC_DEFINE(HAVE_ICONV_H)
+		AC_MSG_RESULT(yes)
+	],[
+		LIBS="$LIBS -liconv"
+		AC_TRY_LINK([
+			#include <iconv.h>
+		],[
+			static void f() {iconv_t t = iconv_open("", ""); }
+		],[
+			AC_DEFINE(HAVE_ICONV_H)
+			AC_MSG_RESULT(yes)
+		],[
+			LIBS="$oldLIBS"
+			CPPFLAGS="$oldCPPFLAGS"
+			AC_MSG_RESULT(no)
+		])
+	])
+fi
+dnl
 dnl ------- BZIP2
 AC_CHECK_LIB(bz2,bzCompressInit)
 if test "$ac_cv_lib_bz2_bzCompressInit" = "yes"; then
@@ -115,6 +165,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
@@ -173,6 +244,7 @@ AC_OUTPUT([
   isamc/Makefile
   isam/Makefile
   rset/Makefile
+  data1/Makefile
   recctrl/Makefile
   index/Makefile
   include/Makefile
@@ -182,6 +254,8 @@ AC_OUTPUT([
   doc/zebrahtml.dsl
   doc/zebraprint.dsl
   doc/zebraphp.dsl
+  doc/tkl.xsl
   test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
-  test/dmoz/Makefile
+  test/dmoz/Makefile test/xpath/Makefile
+  examples/Makefile examples/gils/Makefile
 ])