X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=a001429a7792e64ca129cd6a53cc9a319fd3aaa3;hb=65ae06c475fce3ffaf004d92605df5f01e931835;hp=c18e44314fc068fc0cd3d46aca3d66b78bdb81a7;hpb=3e8db66d56c466a5a269362eb70b4931d9579128;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index c18e443..a001429 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1995-2004
-dnl $Id: configure.in,v 1.97 2004-08-30 21:35:27 adam Exp $
+dnl $Id: configure.in,v 1.99 2004-09-14 14:45:18 quinn Exp $
 dnl
 AC_INIT(include/idzebra/version.h)
 AM_INIT_AUTOMAKE(idzebra,1.4.0)
@@ -21,54 +21,6 @@ AC_PROG_CPP
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 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])
 if test "$enable_threads" = "yes"; then
 	yazflag=threads
@@ -76,6 +28,7 @@ else
 	yazflag=""
 fi
 YAZ_INIT($yazflag)
+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
@@ -163,7 +116,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 +165,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 +190,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
@@ -390,7 +343,7 @@ 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/codec/Makefile