X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.in;h=2d7899674dc9fcb9cd5dafbae48616415f1d4d86;hb=74244d4b660d2e0222cfd5f5f6a61edf19f2b4fe;hp=63084bc29f9af5db46bb60377f4bdda7c280073b;hpb=1e869b75dd665a3ac79648269e1416bf7e04dcdd;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 63084bc..2d78996 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-dnl Zebra, Index Data Aps, 1995-2004
-dnl $Id: configure.in,v 1.90 2004-03-29 15:48:14 adam Exp $
+dnl Zebra, Index Data Aps, 1995-2005
+dnl $Id: configure.in,v 1.91.2.15 2005-10-27 17:39:09 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.16)
+AM_INIT_AUTOMAKE(idzebra,1.3.30)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -21,61 +21,16 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   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
-     if test -f $d/docbookx.dtd; then
-       AC_MSG_RESULT($d)
-       DTD_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DTD_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbook.dsl],
-[
-   if test -f "$withval/html/docbook.dsl"; then
-      DSSSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbook.dsl)
-   for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
-            /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
-   do
-     if test -f $d/html/docbook.dsl; then
-       AC_MSG_RESULT($d)
-       DSSSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DSSSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-dnl
-AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
+dnl ------ threads
+AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threa
+ds=$enableval],[enable_threads=yes])
 if test "$enable_threads" = "yes"; then
 	yazflag=threads
 else
 	yazflag=""
 fi
-YAZ_INIT($yazflag)
+YAZ_INIT($yazflag,2.0.18)
+YAZ_DOC
 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
@@ -126,6 +81,12 @@ dnl
 dnl ------ times
 AC_CHECK_HEADERS(sys/times.h)
 dnl
+dnl ------ crypt
+AC_CHECK_LIB(crypt, crypt)
+if test "$ac_cv_lib_crypt_crypt" = "yes"; then
+	AC_CHECK_HEADERS(crypt.h)
+fi
+dnl
 dnl ------ mkstemp
 AC_CHECK_FUNCS(mkstemp)
 dnl
@@ -163,7 +124,7 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
 fi
 dnl
 dnl ------ iconv
-AC_ARG_WITH(iconv, [  --with-iconv[=DIR]      iconv library in DIR])
+AC_ARG_WITH(iconv, [  --with-iconv[=DIR]        iconv library in DIR])
 if test "$with_iconv" != "no"; then
 	AC_MSG_CHECKING(for iconv)
 	oldLIBS="$LIBS"
@@ -212,7 +173,7 @@ AC_CHECK_LIB(m,sqrt)
 dnl
 dnl ------ EXPAT
 expat=yes
-AC_ARG_WITH(expat,   [  --with-expat[=DIR]      EXPAT library in DIR],[expat=$withval])
+AC_ARG_WITH(expat,   [  --with-expat[=DIR]        EXPAT library in DIR],[expat=$withval])
 if test "$expat" != "no"; then
 	xLIBS="$LIBS";
 	xCFLAGS="$CFLAGS";
@@ -237,7 +198,7 @@ perl=no
 PERL_XS_INIT="NULL"
 PERL_XS_INIT_INCLUDE=''
 PERL_BINARY=""
-AC_ARG_WITH(perl,   [  --with-perl[=FILE]      perl binary location],[perl=$withval])
+AC_ARG_WITH(perl,   [  --with-perl[=FILE]        perl binary location],[perl=$withval])
 if test "$perl" != "no"; then
 	AC_MSG_CHECKING(for perl binary)
 	if test "$perl" = "yes"; then
@@ -387,10 +348,10 @@ AC_OUTPUT([
   doc/tkl.xsl
   test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
   test/rusmarc/Makefile test/cddb/Makefile test/malxml/Makefile 
-  test/config/Makefile
+  test/config/Makefile test/sort2/Makefile
   perl/Makefile.PL test/xelm/Makefile
   test/dmoz/Makefile test/xpath/Makefile test/sort/Makefile test/zsh/Makefile
-  test/marcxml/Makefile test/charmap/Makefile
+  test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
   examples/Makefile examples/gils/Makefile examples/zthes/Makefile
   idzebra.spec
 ])
@@ -398,7 +359,7 @@ if test -x "$perlbin"; then
 	res=`cd perl ; $perlbin Makefile.PL ; cd .. ;`;
 fi
 if test  -z "$YAZLIB"; then
-	echo "YAZ was not found. Use --with-yazconfig=DIR to specify location."
+	echo "YAZ was not found. Use --with-yaz=DIR to specify location."
 	test -f /etc/debian_version && echo "Debian package libyaz-dev is required."
 fi