From 5168b35eab901a50e5afca1a01b2250c343b97f7 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 30 Mar 2006 18:00:51 +0000
Subject: [PATCH] idzebra.m4 moved to sub directory m4

---
 Makefile.am  |    8 ++--
 buildconf.sh |    4 +-
 idzebra.m4   |   57 ------------------------
 yaz.m4       |  138 ----------------------------------------------------------
 4 files changed, 7 insertions(+), 200 deletions(-)
 delete mode 100644 idzebra.m4
 delete mode 100644 yaz.m4

diff --git a/Makefile.am b/Makefile.am
index 39470ff..eaeac2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,19 @@
-## $Id: Makefile.am,v 1.21 2005-01-16 20:19:20 adam Exp $
+## $Id: Makefile.am,v 1.22 2006-03-30 18:00:51 adam Exp $
 
 AUTOMAKE_OPTIONS=foreign
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS=util bfile dfa dict isams isamb isamc rset data1 \
  recctrl tab index test examples include doc
 
 aclocaldir=$(datadir)/aclocal
-aclocal_DATA = idzebra.m4
+aclocal_DATA = m4/idzebra.m4
 
 SPEC_FILE=$(PACKAGE).spec
 
 EXTRA_DIST= README NEWS $(SPEC_FILE) idzebra.spec.in \
- idzebra-config.in idzebra.m4 Doxyfile.in
+ idzebra-config.in m4/idzebra.m4 m4/yaz.m4 Doxyfile.in
 
 dist-hook:
 	cp $(srcdir)/LICENSE* $(distdir)
diff --git a/buildconf.sh b/buildconf.sh
index 3500678..214a262 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.17 2006-03-28 17:03:55 adam Exp $
+# $Id: buildconf.sh,v 1.18 2006-03-30 18:00:51 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"
     if test -f /etc/debian_version; then
@@ -11,7 +11,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 -a 
 autoconf
diff --git a/idzebra.m4 b/idzebra.m4
deleted file mode 100644
index bf4ad4c..0000000
--- a/idzebra.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-## $Id: idzebra.m4,v 1.1 2004-09-15 09:17:25 adam Exp $
-## 
-# Use this m4 function for autoconf if you use ID Zebra in your own
-# configure script.
-
-AC_DEFUN([IDZEBRA_INIT],
-[
-	AC_SUBST(IDZEBRA_LIBS)
-	AC_SUBST(IDZEBRA_LALIBS)
-	AC_SUBST(IDZEBRA_CFLAGS)
-	AC_SUBST(IDZEBRA_VERSION)
-	idzebraconfig=NONE
-	idzebrapath=NONE
-	AC_ARG_WITH(idzebra, [  --with-idzebra=DIR      use idzebra-config in DIR (example /home/idzebra-1.4.0)], [idzebrapath=$withval])
-	if test "x$idzebrapath" != "xNONE"; then
-		idzebraconfig=$idzebrapath/idzebra-config
-	else
-		if test "x$srcdir" = "x"; then
-			idzebrasrcdir=.
-		else
-			idzebrasrcdir=$srcdir
-		fi
-		for i in ${idzebrasrcdir}/../idzebra* ${idzebrasrcdir}/../idzebra ../idzebra* ../zebra; do
-			if test -d $i; then
-				if test -r $i/idzebra-config; then
-					idzebraconfig=$i/idzebra-config
-				fi
-			fi
-		done
-		if test "x$idzebraconfig" = "xNONE"; then
-			AC_PATH_PROG(idzebraconfig, idzebra-config, NONE)
-		fi
-	fi
-	AC_MSG_CHECKING(for idzebra)
-	if $idzebraconfig --version >/dev/null 2>&1; then
-		IDZEBRA_LIBS=`$idzebraconfig --libs $1`
-		IDZEBRA_LALIBS=`$idzebraconfig --lalibs $1`
-		IDZEBRA_CFLAGS=`$idzebraconfig --cflags $1`
-		IDZEBRA_VERSION=`$idzebraconfig --version`
-		AC_MSG_RESULT([$idzebraconfig])
-	else
-		AC_MSG_RESULT(Not found)
-		IDZEBRA_VERSION=NONE
-	fi
-	if test "X$IDZEBRA_VERSION" != "XNONE"; then
-		AC_MSG_CHECKING([for idzebra version])
-		AC_MSG_RESULT([$IDZEBRA_VERSION])
-		if test "$2"; then
-			have_idzebra_version=`echo "$IDZEBRA_VERSION" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
-			req_idzebra_version=`echo "$2" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`
-			if test "$have_idzebra_version" -lt "$req_idzebra_version"; then
-				AC_MSG_ERROR([$IDZEBRA_VERSION. Requires $2 or later])
-			fi
-		fi
-	fi
-]) 
-
diff --git a/yaz.m4 b/yaz.m4
deleted file mode 100644
index 9626319..0000000
--- a/yaz.m4
+++ /dev/null
@@ -1,138 +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/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(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
-]) 
-
-- 
1.7.10.4