diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index e028514a..a7ffbabf 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>
 
 	* gpgme.h (struct _gpgme_signature): New members pubkey_algo and
diff --git a/gpgme/gpgme.m4 b/gpgme/gpgme.m4
index 1915f550..10ee13f9 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 | \