X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=c32ac27b142366cc120c85d01d2647a24aa8b42f;hb=6acd2e140d59433a002f2f1890cb4a6e25895c68;hp=9ee2cf25ac1565ebf965233b8e05d6163967b495;hpb=ec020ffecd27c2569cb69ba155a93f6183426627;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 9ee2cf2..c32ac27 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data ApS, 1995-2005
-dnl $Id: configure.in,v 1.117 2005-03-31 12:55:55 adam Exp $
+dnl $Id: configure.in,v 1.132 2006-02-17 14:06:06 marc Exp $
 dnl
 AC_INIT(include/idzebra/version.h)
 AM_INIT_AUTOMAKE(idzebra,1.4.0)
@@ -15,7 +15,12 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 dnl
 dnl ------ headers
-AC_CHECK_HEADERS(sys/times.h unistd.h)
+AC_CHECK_HEADERS(sys/times.h sys/time.h unistd.h sys/resource.h)
+dnl ------ crypt
+AC_CHECK_LIB(crypt, crypt)
+if test "$ac_cv_lib_crypt_crypt" = "yes"; then
+	AC_CHECK_HEADERS(crypt.h)
+fi
 dnl
 dnl ------ threads
 AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
@@ -26,8 +31,39 @@ else
 fi
 dnl
 dnl ------ YAZ
-YAZ_INIT($yazflag,2.0.29)
+YAZ_INIT($yazflag,2.1.9)
 YAZ_DOC
+dnl ----- libXSLT
+AC_SUBST(XSLT_LIBS)
+AC_SUBST(XSLT_CFLAGS)
+xsltdir=yes
+AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libxslt in PREFIX]],xsltdir=$withval)
+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 test "$xsltdir" != "no"; then
+	AC_MSG_CHECKING(for libXSLT)
+
+	if test -x $xsltdir/bin/xslt-config; then
+		XSLT_VER=`$xsltdir/bin/xslt-config --version`
+		AC_MSG_RESULT($XSLT_VER)
+		have_xslt_version=`echo "$XSLT_VER" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
+		if test $have_xslt_version -lt 1001011; then
+			AC_MSG_WARN([libXSLT too old. Use 1.1.11 or later.])
+			XSLT_VER=""
+		else
+			XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
+			XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
+			AC_DEFINE(HAVE_XSLT)
+		fi
+	else
+		AC_MSG_RESULT(Not found)
+	fi
+fi
 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
@@ -70,6 +106,16 @@ if test -r ${tclconfig}/tclConfig.sh; then
         SHLIB_VERSION=$TCL_SHLIB_VERSION
         AC_MSG_RESULT($TCL_VERSION)
 	AC_DEFINE(HAVE_TCL_H,1)
+
+	# The Mac OSX -framework causes problems with Libtool
+	# and dependancy libs.. so apply Tcl libs everywhere
+	# bug #461
+	case $host in
+	*-*-darwin*)
+		LIBS="$LIBS $TCL_LIB";
+                ;;
+	esac
+
 else
         AC_MSG_RESULT(Not found)
 	AC_DEFINE(HAVE_TCL_H,0)
@@ -247,7 +293,8 @@ AC_DEFUN([ZEBRA_MODULE],[
 	elif test "$myen" = "no"; then
 	   AC_MSG_RESULT([disabled])
 	else
-	   AC_MSG_RESULT([bad value. Assuming disabled])
+	   AC_MSG_RESULT([$myen])
+	   AC_MSG_ERROR([invalid --enable-mod-$1 value. Use on,off,static or shared])
 	fi
 ])
 
@@ -255,15 +302,22 @@ ZEBRA_MODULE(text,static,    [  --enable-mod-text       Text filter])
 ZEBRA_MODULE(grs-sgml,static,[  --enable-mod-grs-sgml   Simple SGML/XML filter])
 ZEBRA_MODULE(grs-regx,shared,[  --enable-mod-grs-regx   REGX/TCL filter])
 ZEBRA_MODULE(grs-marc,shared,[  --enable-mod-grs-marc   MARC filter])
+ZEBRA_MODULE(grs-csv,shared, [  --enable-mod-grs-csv    CSV filter])
 ZEBRA_MODULE(grs-danbib,shared,[  --enable-mod-grs-danbib DanBib filter (DBC)])
-ZEBRA_MODULE(safari,shared,[  --enable-mod-safari Safari filter (DBC)])
+ZEBRA_MODULE(safari,shared,  [  --enable-mod-safari Safari filter (DBC)])
 if test "$ac_cv_header_expat_h" = "yes"; then
    def="shared"
 else
    def="no"
 fi
 ZEBRA_MODULE(grs-xml,[$def], [  --enable-mod-grs-xml    XML filter (Expat based)])
-ZEBRA_MODULE(alvis,shared,   [  --enable-mod-alvis      ALVIS XML filter])
+if test "$XSLT_VER"; then
+   def="shared"
+else
+   def="no"
+fi
+ZEBRA_MODULE(xslt,[$def],    [  --enable-mod-xslt       XSLT filter])
+ZEBRA_MODULE(alvis,[$def],   [  --enable-mod-alvis      ALVIS filter])
 dnl ------ ANSI C Header files
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
@@ -296,6 +350,7 @@ AC_OUTPUT([
   doc/zebraphp.dsl
   doc/tkl.xsl
   test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
+  test/xslt/Makefile
   test/xpath/Makefile
   test/rusmarc/Makefile test/cddb/Makefile test/malxml/Makefile 
   test/mbox/Makefile
@@ -304,8 +359,9 @@ AC_OUTPUT([
   test/dmoz/Makefile test/sort/Makefile test/zsh/Makefile
   test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
   test/espec/Makefile
+  test/filters/Makefile
   examples/Makefile examples/gils/Makefile examples/zthes/Makefile
-  examples/marc21/Makefile
+  examples/marc21/Makefile examples/alvis-oai/Makefile
   idzebra.spec
   idzebra-config
   Doxyfile