Using yazpp.m4 + yaz.m4 from m4 directory

diff --git a/Makefile.am b/Makefile.am
index e61093c..b5b93c2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,12 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src include zlint zoom doc 
 
+ACLOCAL_AMFLAGS = -I m4
+
 aclocaldir=$(datadir)/aclocal
-aclocal_DATA = yazpp.m4
+aclocal_DATA = m4/yazpp.m4
 
-EXTRA_DIST= LICENSE TODO yazpp-config.in yazpp.m4 buildconf.sh
+EXTRA_DIST= LICENSE TODO yazpp-config.in m4/yaz.m4 m4/yazpp.m4 buildconf.sh
 
 dist-hook:
        mkdir $(distdir)/win

diff --git a/buildconf.sh b/buildconf.sh
index ba45bc9..be496e7 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.13 2006-03-30 07:45:55 adam Exp $
+# $Id: buildconf.sh,v 1.14 2006-03-30 16:36:12 adam Exp $
 
 if automake --version|head -1 |grep '1\.[4-7]'; then
     echo "automake 1.4-1.7 is active. You should use automake 1.8 or later"
@@ -12,7 +12,7 @@ fi
 
 set -x
 # I am tired of underquoted warnings for Tcl macros
-aclocal -I . 2>&1 | grep -v aclocal/tcl.m4
+aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
 libtoolize --automake --force 
 automake --add-missing 
 autoconf

diff --git a/yaz.m4 b/yaz.m4
deleted file mode 100644 (file)
index 2782a1d..0000000
--- a/yaz.m4
+++ /dev/null
@@ -1,137 +0,0 @@
-# Use this m4 function for autoconf if you use YAZ in your own
-# configure script.
-
-dnl ----- Setup Docbook documentation for YAZ
-AC_DEFUN([YAZ_DOC],
-[
-AC_SUBST(DTD_DIR)      
-AC_ARG_WITH(docbook-dtd,[[  --with-docbook-dtd=DIR  use docbookx.dtd in DIR]],
-[
-       if test -f "$withval/docbookx.dtd"; then
-               DTD_DIR=$withval
-       fi
-],[
-       AC_MSG_CHECKING(for docbookx.dtd)
-       DTD_DIR=""
-       for d in /usr/lib/sgml/dtd/docbook-xml \
-                /usr/share/sgml/docbook/dtd/4.2 \
-                /usr/share/sgml/docbook/dtd/xml/4.* \
-                /usr/share/sgml/docbook/xml-dtd-4.* 
-       do
-               if test -f $d/docbookx.dtd; then
-                       DTD_DIR=$d
-               fi
-       done
-       if test -z "$DTD_DIR"; then
-               AC_MSG_RESULT(Not found)
-       else
-               AC_MSG_RESULT($d)
-       fi
-])
-AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(docbook-dsssl,[[  --with-docbook-dsssl=DIR use Docbook 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)
-       DSSSL_DIR=""
-       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
-])
-AC_SUBST(XSL_DIR)
-AC_ARG_WITH(docbook-xsl,[[  --with-docbook-xsl=DIR  use Docbook XSL in DIR/{htmlhelp,xhtml}]],
-[
-       if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
-               XSL_DIR=$withval
-       fi
-],[
-       AC_MSG_CHECKING(for htmlhelp.xsl)
-       for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
-               /usr/share/sgml/docbook/xsl-stylesheets-1.* 
-       do
-               if test -f $d/htmlhelp/htmlhelp.xsl; then
-                       AC_MSG_RESULT($d)
-                       XSL_DIR=$d
-                       break
-               fi
-       done
-       if test -z "$XSL_DIR"; then
-               AC_MSG_RESULT(Not found)
-       fi
-])
-]) 
-
-AC_DEFUN([YAZ_INIT],
-[
-       AC_SUBST(YAZLIB)
-       AC_SUBST(YAZLALIB)
-       AC_SUBST(YAZINC)
-       AC_SUBST(YAZVERSION)
-       yazconfig=NONE
-       yazpath=NONE
-       AC_ARG_WITH(yaz, [  --with-yaz=DIR          use yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
-       if test "x$yazpath" != "xNONE"; then
-               yazconfig=$yazpath/yaz-config
-       else
-               if test "x$srcdir" = "x"; then
-                       yazsrcdir=.
-               else
-                       yazsrcdir=$srcdir
-               fi
-               for i in ${yazsrcdir}/../../yaz ${yazsrcdir}/../yaz* ${yazsrcdir}/../yaz; do
-                       if test -d $i; then
-                               if test -r $i/yaz-config; then
-                                       yazconfig=$i/yaz-config
-                               fi
-                       fi
-               done
-               if test "x$yazconfig" = "xNONE"; then
-                       AC_PATH_PROG(yazconfig, yaz-config, NONE)
-               fi
-       fi
-       AC_MSG_CHECKING(for YAZ)
-       if $yazconfig --version >/dev/null 2>&1; then
-               YAZLIB=`$yazconfig --libs $1`
-               # if this is empty, it's a simple version YAZ 1.6 script
-               # so we have to source it instead...
-               if test "X$YAZLIB" = "X"; then
-                       . $yazconfig
-               else
-                       YAZLALIB=`$yazconfig --lalibs $1`
-                       YAZINC=`$yazconfig --cflags $1`
-                       YAZVERSION=`$yazconfig --version`
-               fi
-               AC_MSG_RESULT([$yazconfig])
-       else
-               AC_MSG_RESULT(Not found)
-               YAZVERSION=NONE
-       fi
-       if test "X$YAZVERSION" != "XNONE"; then
-               AC_MSG_CHECKING([for YAZ version])
-               AC_MSG_RESULT([$YAZVERSION])
-               if test "$2"; then
-                       have_yaz_version=`echo "$YAZVERSION" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
-                       req_yaz_version=`echo "$2" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
-                       if test "$have_yaz_version" -lt "$req_yaz_version"; then
-                               AC_MSG_ERROR([$YAZVERSION. Requires $2 or later])
-                       fi
-                       if test "$req_yaz_version" -gt "2000028"; then
-                               YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"
-                       fi
-               fi
-       fi
-]) 
-

diff --git a/yazpp.m4 b/yazpp.m4
deleted file mode 100644 (file)
index cf121a0..0000000
--- a/yazpp.m4
+++ /dev/null
@@ -1,52 +0,0 @@
-AC_DEFUN([YAZPP_INIT],
-[
-        AC_SUBST(YAZPPLIB)
-        AC_SUBST(YAZPPLALIB)
-        AC_SUBST(YAZPPINC)
-        AC_SUBST(YAZPPVERSION)
-        yazppconfig=NONE
-        yazpppath=NONE
-        AC_ARG_WITH(yazpp, [  --with-yazpp=DIR        yazpp-config in DIR (example /home/yazpp-1.0.0)], [yazpppath=$withval])
-        if test "x$yazpppath" != "xNONE"; then
-                yazppconfig=$yazpppath/yazpp-config
-        else
-                if test "x$srcdir" = "x"; then
-                        yazppsrcdir=.
-                else
-                        yazppsrcdir=$srcdir
-                fi
-                for i in ${yazppsrcdir}/../../yazpp ${yazppsrcdir}/../yazpp-* ${yazppsrcdir}/../yazpp; do
-                        if test -d $i; then
-                                if test -r $i/yazpp-config; then
-                                        yazppconfig=$i/yazpp-config
-                                fi
-                        fi
-                done
-                if test "x$yazppconfig" = "xNONE"; then
-                        AC_PATH_PROG(yazppconfig, yazpp-config, NONE)
-                fi
-        fi
-        AC_MSG_CHECKING(for YAZ++)
-        if $yazppconfig --version >/dev/null 2>&1; then
-                YAZPPLIB=`$yazppconfig --libs $1`
-                YAZPPLALIB=`$yazppconfig --lalibs $1`
-                YAZPPINC=`$yazppconfig --cflags $1`
-                YAZPPVERSION=`$yazppconfig --version`
-                AC_MSG_RESULT($yazppconfig)
-        else
-                AC_MSG_RESULT(Not found)
-                YAZVERSION=NONE
-        fi
-       if test "X$YAZPPVERSION" != "XNONE"; then
-               AC_MSG_CHECKING([for YAZ++ version])
-               AC_MSG_RESULT([$YAZPPVERSION])
-               if test "$2"; then
-                       have_yaz_version=`echo "$YAZPPVERSION" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
-                       req_yaz_version=`echo "$2" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
-                       if test "$have_yaz_version" -lt "$req_yaz_version"; then
-                               AC_MSG_ERROR([$YAZPPVERSION. Requires $2 or later])
-                       fi
-               fi
-       fi
-])
-