zoom part of automake mess

diff --git a/configure.in b/configure.in
index c472941..6a782d7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,6 +10,57 @@ AM_PROG_LIBTOOL
 
 YAZ_INIT(threads)
 
+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_SUBST(YAZPP_SRC_ROOT)
 AC_SUBST(YAZPP_BUILD_ROOT)
 YAZPP_SRC_ROOT=`cd ${srcdir}; pwd`
@@ -26,4 +77,5 @@ AC_OUTPUT([
        include/yaz++/Makefile
        yaz++-config
        src/yaz++-config
+       zoom/Makefile
 ],[chmod +x yaz++-config src/yaz++-config])

diff --git a/zoom/Makefile b/zoom/Makefile
deleted file mode 100644 (file)
index e0e01f9..0000000
--- a/zoom/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Header: /home/cvsroot/yaz++/zoom/Attic/Makefile,v 1.4 2002-08-09 09:03:37 mike Exp $
-
-CPPFLAGS := -Wall -g -ansi
-L = libzoom.a
-OBJ = $L(zexcept.o) $L(zconn.o) $L(zquery.o) $L(zrs.o) $L(zrec.o)
-
-all: interface.h zclient
-
-zclient: zclient.o $L
-       $(CXX) $(CPPFLAGS) -o zclient zclient.o $L -lyaz
-
-test: zclient
-       ./zclient bagel.indexdata.dk 210 gils '@and mineral epicenter'
-
-$L: $(OBJ)
-       ranlib $L
-
-$(OBJ): zoom++.h
-
-zclient.o: zoom++.h
-
-zoom++.h: master-header
-       rm -f $@
-       sed 's/^*       /       /; s/^*/ /' $< > $@
-       chmod -w $@
-
-interface.h: master-header
-       rm -f $@
-       grep -v '^*' $< > $@
-       chmod -w $@
-
-clean:
-       rm -f zoom++.h interface.h zclient *.[ao] core