Ignore generated files.

[elisp/epg.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 6711d8b..85d95ba 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -391,7 +391,7 @@ AC_DEFUN([AC_CHECK_GPG],
              sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $1 | \
              sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    gpg_version=`$GPG --version | grep ^gpg`
+    gpg_version=`"$GPG" --version | grep ^gpg`
     major=`echo $gpg_version | \
          sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $gpg_version | \
@@ -417,12 +417,15 @@ AC_DEFUN([AC_CHECK_GPG],
     fi
     if test "$ok" = "yes"; then
       AC_MSG_RESULT(yes)
-      ifelse([$2], , :, [$2])
     else
       AC_MSG_RESULT(no)
       AC_MSG_WARN([GnuPG must be at least version $1])
-      ifelse([$3], , :, [$3])
     fi
   fi
+  if test "$ok" = "yes"; then
+    ifelse([$2], , :, [$2])
+  else
+    ifelse([$3], , :, [$3])
+  fi
   AM_CONDITIONAL(RUN_GPG_TESTS, test "$ok" = "yes")
-  AC_SUBST(GPG_PATH)])
\ No newline at end of file
+  AC_SUBST(GPG_PATH)])