Added these
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 26 Apr 2004 09:12:01 +0000 (09:12 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 26 Apr 2004 09:12:01 +0000 (09:12 +0000)
buildconf.sh [new file with mode: 0755]
yaz.m4 [new file with mode: 0644]

diff --git a/buildconf.sh b/buildconf.sh
new file mode 100755 (executable)
index 0000000..d485e38
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+# $Id: buildconf.sh,v 1.1 2004-04-26 09:12:01 adam Exp $
+set -x
+aclocal -I .
+autoconf
+if [ -f config.cache ]; then
+       rm config.cache
+fi
diff --git a/yaz.m4 b/yaz.m4
new file mode 100644 (file)
index 0000000..0326ff2
--- /dev/null
+++ b/yaz.m4
@@ -0,0 +1,63 @@
+## $Id: yaz.m4,v 1.1 2004-04-26 09:12:01 adam Exp $
+## 
+# Use this m4 funciton for autoconf if you use YAZ in your own
+# configure script.
+# YAZ_INIT
+
+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
+])