gpgme-1-0-branch gpgme/gpgme (ChangeLog gpgme.m4)

[cvs user marcus]

    Date: Monday, June 20, 2005 @ 20:11:42
  Author: marcus
    Path: /cvs/gpgme/gpgme/gpgme
     Tag: gpgme-1-0-branch

Modified: ChangeLog gpgme.m4

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

	* gpgme.m4: Only call GPGME_CONFIG if found.


-----------+
 ChangeLog |    4 ++++
 gpgme.m4  |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)


Index: gpgme/gpgme/ChangeLog
diff -u gpgme/gpgme/ChangeLog:1.386.2.7 gpgme/gpgme/ChangeLog:1.386.2.8
--- gpgme/gpgme/ChangeLog:1.386.2.7	Fri Jun  3 01:09:54 2005
+++ gpgme/gpgme/ChangeLog	Mon Jun 20 20:11:42 2005
@@ -1,3 +1,7 @@
+2005-06-20  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpgme.m4: Only call GPGME_CONFIG if found.
+
 2005-06-03  Marcus Brinkmann  <marcus at g10code.de>
 
 	* wait-global.c (gpgme_wait): Break out of the fd processing loop
Index: gpgme/gpgme/gpgme.m4
diff -u gpgme/gpgme/gpgme.m4:1.9 gpgme/gpgme/gpgme.m4:1.9.2.1
--- gpgme/gpgme/gpgme.m4:1.9	Thu Sep 30 03:06:18 2004
+++ gpgme/gpgme/gpgme.m4	Mon Jun 20 20:11:42 2005
@@ -20,7 +20,9 @@
   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 | \