X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=idzebra-2.0.m4;h=c74eef0e313881543a105b855a3d844b60471ea5;hb=cbe5631365b3ef5a840942cab5e03a50a665fe07;hp=25d08c80ef4bd2e3acbd5bc47737c0e6cc7a622b;hpb=d677148d5bbcb1bfd119d0ae83ff19c0f0012082;p=m4-moved-to-github.git diff --git a/idzebra-2.0.m4 b/idzebra-2.0.m4 index 25d08c8..c74eef0 100644 --- a/idzebra-2.0.m4 +++ b/idzebra-2.0.m4 @@ -1,5 +1,3 @@ -## $Id: idzebra-2.0.m4,v 1.1 2006-08-14 12:18:49 adam Exp $ -## # Use this m4 function for autoconf if you use ID Zebra in your own # configure script. @@ -34,9 +32,9 @@ AC_DEFUN([IDZEBRA_2_0_INIT], 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_LIBS=`$idzebraconfig --libs` + IDZEBRA_LALIBS=`$idzebraconfig --lalibs` + IDZEBRA_CFLAGS=`$idzebraconfig --cflags` IDZEBRA_VERSION=`$idzebraconfig --version` AC_MSG_RESULT([$idzebraconfig]) else @@ -46,11 +44,11 @@ AC_DEFUN([IDZEBRA_2_0_INIT], if test "X$IDZEBRA_VERSION" != "XNONE"; then AC_MSG_CHECKING([for idzebra version]) AC_MSG_RESULT([$IDZEBRA_VERSION]) - if test "$2"; then + if test "$1"; 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;}'` + req_idzebra_version=`echo "$1" | 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 idzebra $2 or later]) + AC_MSG_ERROR([$IDZEBRA_VERSION. Requires idzebra $1 or later]) fi fi fi