diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2005-06-20 18:11:42 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2005-06-20 18:11:42 +0000 |
| commit | ad4588f8fc7e49c97f817773b4f9c3a5c09b3e98 (patch) | |
| tree | 4c2751783fcfc397043e0a94b919fb7f72773a93 | |
| parent | 63ac903f64aec6fb71499f4c524aacaaac25388e (diff) | |
| download | gpgme-ad4588f8fc7e49c97f817773b4f9c3a5c09b3e98.tar.gz | |
2005-06-20 Marcus Brinkmann <marcus@g10code.de>
* gpgme.m4: Only call GPGME_CONFIG if found.
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/gpgme.m4 | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index ccb53ffb..7fd5e0e0 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 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 | \ |