From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 16 Aug 2004 12:38:22 +0000 (+0000)
Subject: Added updated yaz.m4
X-Git-Tag: YAZPROXY.0.9~46
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=737c207382e09b33e60af82897e0509786606a87;p=yazproxy-moved-to-github.git

Added updated yaz.m4
---

diff --git a/buildconf.sh b/buildconf.sh
index 8089ab2..3b9d2b1 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.2 2004-04-11 14:25:50 adam Exp $
+# $Id: buildconf.sh,v 1.3 2004-08-16 12:38:22 adam Exp $
 set -x
 dir=`aclocal --print-ac-dir`
-if [ -f $dir/yazpp.m4 ]; then
-	aclocal
-else
+#if [ -f $dir/yazpp.m4 ]; then
+#	aclocal
+#else
 	aclocal -I . 
-fi
+#fi
 libtoolize --force 
 automake -a 
 automake -a 
diff --git a/yaz.m4 b/yaz.m4
index 0630a39..539f9f5 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,66 +1,8 @@
-## $Id: yaz.m4,v 1.1 2004-04-30 19:39:32 adam Exp $
+## $Id: yaz.m4,v 1.2 2004-08-16 12:38:22 adam Exp $
 ## 
 # Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
 
-AC_DEFUN([YAZ_INIT],
-[
-	AC_SUBST(YAZLIB)
-	AC_SUBST(YAZLALIB)
-	AC_SUBST(YAZINC)
-	AC_SUBST(YAZVERSION)
-	yazconfig=NONE
-	yazpath=NONE
-	AC_ARG_WITH(yazconfig, [  --with-yazconfig=DIR    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 ../yaz* ../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
-		fi
-	fi
-]) 
-
 dnl ----- Setup Docbook documentation for YAZ
 AC_DEFUN([YAZ_DOC],
 [
@@ -134,3 +76,62 @@ AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        use Docbook XSL in DIR/{htmlhelp,xhtm
 	fi
 ])
 ]) 
+
+AC_DEFUN([YAZ_INIT],
+[
+	AC_SUBST(YAZLIB)
+	AC_SUBST(YAZLALIB)
+	AC_SUBST(YAZINC)
+	AC_SUBST(YAZVERSION)
+	yazconfig=NONE
+	yazpath=NONE
+	AC_ARG_WITH(yazconfig, [  --with-yazconfig=DIR    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 ../yaz* ../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
+		fi
+	fi
+]) 
+