From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 2 Mar 2012 12:15:12 +0000 (+0100)
Subject: Allow --without-usemarcon
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=a63e9ca4bf4ca6e78f16d58196e7b962de95a6f1;p=m4-moved-to-github.git

Allow --without-usemarcon

to disallow "search" of USEMARCON in sibling directories etc.
---

diff --git a/usemarcon.m4 b/usemarcon.m4
index c17d90b..8c7fb45 100644
--- a/usemarcon.m4
+++ b/usemarcon.m4
@@ -6,9 +6,7 @@ AC_DEFUN([USEMARCON_INIT],
         usemarconpath=NONE
         AC_ARG_WITH(usemarcon, [  --with-usemarcon=DIR    usemarcon-config in DIR (example /home/usemarcon145)], [usemarconpath=$withval])
 
-        if test "x$usemarconpath" != "xNONE"; then
-                usemarconconfig=$usemarconpath/usemarcon-config
-        else
+        if test "$usemarconpath" = "NONE"; then
                 if test "x$srcdir" = "x"; then
                         usemarconsrcdir=.
                 else
@@ -24,6 +22,8 @@ AC_DEFUN([USEMARCON_INIT],
                 if test "x$usemarconconfig" = "xNONE"; then
                         AC_PATH_PROG(usemarconconfig, usemarcon-config, NONE)
                 fi
+	elif test "$usemarconpath" != "no"; then
+                usemarconconfig=$usemarconpath/usemarcon-config
         fi
 
         AC_MSG_CHECKING(for USEMARCON)