Check for yazpp.m4 instead of yaz.m4

diff --git a/buildconf.sh b/buildconf.sh
index 17d2eeb..8089ab2 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.1 2004-04-11 11:36:46 adam Exp $
+# $Id: buildconf.sh,v 1.2 2004-04-11 14:25:50 adam Exp $
 set -x
 dir=`aclocal --print-ac-dir`
-if [ -f $dir/yaz.m4 ]; then
+if [ -f $dir/yazpp.m4 ]; then
        aclocal
 else
        aclocal -I . 

diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644 (file)
index 52b7bec..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,323 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-DSSSL_DIR = @DSSSL_DIR@
-DTD_DIR = @DTD_DIR@
-ECHO = @ECHO@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-RC = @RC@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XSLT_CFLAGS = @XSLT_CFLAGS@
-XSLT_LIBS = @XSLT_LIBS@
-YAZPPINC = @YAZPPINC@
-YAZPPLALIB = @YAZPPLALIB@
-YAZPPLIB = @YAZPPLIB@
-YAZPPVERSION = @YAZPPVERSION@
-YAZPROXY_BUILD_ROOT = @YAZPROXY_BUILD_ROOT@
-YAZPROXY_SRC_ROOT = @YAZPROXY_SRC_ROOT@
-yazppconfig = @yazppconfig@
-
-docdir = $(datadir)/doc/@PACKAGE@
-
-SUPPORTFILES =   yazhtml.dsl.in  yazphp.dsl.in  yazprint.dsl.in  tkl.xsl.in  xml.dcl
-
-XMLFILES =   introduction.xml  installation.xml  proxy.xml  yaz-proxy-ref.xml  yaz-proxy-man.sgml  license.xml  yazproxy.xml.in
-
-
-TOP = yazproxy.xml
-MANFILES = yaz-proxy.8
-HTMLFILES =   installation.html  introduction.html  license.html  other-optimizations.html  otherinfo-encoding.html  proxy-config-file.html  proxy-keepalive.html  proxy-target.html  proxy-usage.html  proxy.html  query-cache.html  query-validation.html  record-cache.html  record-validation.html  windows.html  yaz-proxy.html  yazproxy.html
-
-
-doc_DATA = $(HTMLFILES) yazproxy.pdf id.png yaz.css
-
-man_MANS = $(MANFILES)
-
-EXTRA_DIST = $(SUPPORTFILES) $(XMLFILES) $(doc_DATA) $(man_MANS)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =  yazproxy.xml yazprint.dsl yazphp.dsl yazhtml.dsl \
-tkl.xsl
-man8dir = $(mandir)/man8
-MANS = $(man_MANS)
-
-NROFF = nroff
-DATA =  $(doc_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in tkl.xsl.in yazhtml.dsl.in \
-yazphp.dsl.in yazprint.dsl.in yazproxy.xml.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-yazproxy.xml: $(top_builddir)/config.status yazproxy.xml.in
-       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-yazprint.dsl: $(top_builddir)/config.status yazprint.dsl.in
-       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-yazphp.dsl: $(top_builddir)/config.status yazphp.dsl.in
-       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-yazhtml.dsl: $(top_builddir)/config.status yazhtml.dsl.in
-       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-tkl.xsl: $(top_builddir)/config.status tkl.xsl.in
-       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-install-man8:
-       $(mkinstalldirs) $(DESTDIR)$(man8dir)
-       @list='$(man8_MANS)'; \
-       l2='$(man_MANS)'; for i in $$l2; do \
-         case "$$i" in \
-           *.8*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-         else file=$$i; fi; \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-         $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-       done
-
-uninstall-man8:
-       @list='$(man8_MANS)'; \
-       l2='$(man_MANS)'; for i in $$l2; do \
-         case "$$i" in \
-           *.8*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-         rm -f $(DESTDIR)$(man8dir)/$$inst; \
-       done
-install-man: $(MANS)
-       @$(NORMAL_INSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) install-man8
-uninstall-man:
-       @$(NORMAL_UNINSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) uninstall-man8
-
-install-docDATA: $(doc_DATA)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(docdir)
-       @list='$(doc_DATA)'; for p in $$list; do \
-         if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \
-         else if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
-         fi; fi; \
-       done
-
-uninstall-docDATA:
-       @$(NORMAL_UNINSTALL)
-       list='$(doc_DATA)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(docdir)/$$p; \
-       done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = doc
-
-distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
-       distdir=`cd $(distdir) && pwd`; \
-       cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
-       @for file in $(DISTFILES); do \
-         d=$(srcdir); \
-         if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
-         else \
-           test -f $(distdir)/$$file \
-           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-           || cp -p $$d/$$file $(distdir)/$$file || :; \
-         fi; \
-       done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-man install-docDATA
-install-data: install-data-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-man uninstall-docDATA
-uninstall: uninstall-am
-all-am: Makefile $(MANS) $(DATA)
-all-redirect: all-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-       $(mkinstalldirs)  $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(docdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-       -rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: install-man8 uninstall-man8 install-man uninstall-man \
-uninstall-docDATA install-docDATA tags distdir info-am info dvi-am dvi \
-check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-$(HTMLFILES): $(XMLFILES)
-       jade -E14 -D $(srcdir) -d yazhtml.dsl -t sgml $(srcdir)/xml.dcl $(TOP)
-
-yaz-proxy.8: yaz-proxy-man.sgml yaz-proxy-ref.xml
-       docbook2man $(srcdir)/yaz-proxy-man.sgml
-
-yazproxy.php: $(XMLFILES)
-       jade -E14 -D $(srcdir) -d yazphp.dsl -t sgml $(srcdir)/xml.dcl $(TOP)
-
-yazproxy.pdf: $(XMLFILES)
-       if test ! -f id.png ; then ln -s $(srcdir)/id.png .; fi
-       jade -E14 -D $(srcdir) -d yazprint.dsl -t tex $(srcdir)/xml.dcl $(TOP)
-       pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1
-       pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1
-       pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1
-
-index.tkl: $(XMLFILES) tkl.xsl
-       xsltproc tkl.xsl $(TOP)
-
-clean-data-hook:
-       rm -f [0-9]* *.bak
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT: