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

diff --git a/configure.in b/configure.in
index 9ab20c5..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.119 2005-04-28 08:20:39 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,7 +31,7 @@ else
 fi
 dnl
 dnl ------ YAZ
-YAZ_INIT($yazflag,2.1.3)
+YAZ_INIT($yazflag,2.1.9)
 YAZ_DOC
 dnl ----- libXSLT
 AC_SUBST(XSLT_LIBS)
@@ -42,12 +47,19 @@ if test "$xsltdir" = "yes"; then
 fi
 if test "$xsltdir" != "no"; then
 	AC_MSG_CHECKING(for libXSLT)
+
 	if test -x $xsltdir/bin/xslt-config; then
-		XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
-		XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
 		XSLT_VER=`$xsltdir/bin/xslt-config --version`
 		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE(HAVE_XSLT)
+		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
@@ -94,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)
@@ -271,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
 ])
 
@@ -279,6 +302,7 @@ 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)])
 if test "$ac_cv_header_expat_h" = "yes"; then
@@ -293,7 +317,7 @@ else
    def="no"
 fi
 ZEBRA_MODULE(xslt,[$def],    [  --enable-mod-xslt       XSLT filter])
-ZEBRA_MODULE(alvis,shared,   [  --enable-mod-alvis      ALVIS 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
@@ -335,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