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

	* gpgme.m4: Only call GPGME_CONFIG if found.

diff --git a/branches/gpgme-1-0-branch/gpgme/ChangeLog b/branches/gpgme-1-0-branch/gpgme/ChangeLog
index ccb53ffb6b22110940dc3640efd670c507829e98..7fd5e0e04fe5ad2aa0176e0cd2fbbd944f2e56e0 100644 (file)
--- a/branches/gpgme-1-0-branch/gpgme/ChangeLog
+++ b/branches/gpgme-1-0-branch/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/branches/gpgme-1-0-branch/gpgme/gpgme.m4 b/branches/gpgme-1-0-branch/gpgme/gpgme.m4
index 1915f550e7d094e5c341e8504ac4ba77adfae9b3..10ee13f9473a5a7dd8ad644cbc12ac4d4e729c43 100644 (file)
--- a/branches/gpgme-1-0-branch/gpgme/gpgme.m4
+++ b/branches/gpgme-1-0-branch/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 | \