From: Marcus Brinkmann <mb@g10code.com>
Date: Mon, 20 Jun 2005 18:11:42 +0000 (+0000)
Subject: 2005-06-20  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1-0-3~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad4588f8fc7e49c97f817773b4f9c3a5c09b3e98;p=gpgme.git

2005-06-20  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme.m4: Only call GPGME_CONFIG if found.
---

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index ccb53ff..7fd5e0e 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-20  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme.m4: Only call GPGME_CONFIG if found.
+
 2005-06-03  Marcus Brinkmann  <marcus@g10code.de>
 
 	* wait-global.c (gpgme_wait): Break out of the fd processing loop
diff --git a/gpgme/gpgme.m4 b/gpgme/gpgme.m4
index 1915f55..10ee13f 100644
--- a/gpgme/gpgme.m4
+++ b/gpgme/gpgme.m4
@@ -20,7 +20,9 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
   fi
   AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
 
-  gpgme_version=`$GPGME_CONFIG --version`
+  if test "$GPGME_CONFIG" != "no" ; then
+    gpgme_version=`$GPGME_CONFIG --version`
+  fi
   gpgme_version_major=`echo $gpgme_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
   gpgme_version_minor=`echo $gpgme_version | \