* acinclude.m4 (AC_CHECK_GPG): Run $3 if there is no gpg executable.

diff --git a/ChangeLog b/ChangeLog
index c9e80c9..ef5619e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-29  Daiki Ueno  <ueno@unixuser.org>
+
+       * acinclude.m4 (AC_CHECK_GPG): Run $3 if there is no gpg executable.
+
 2006-07-28  Daiki Ueno  <ueno@unixuser.org>
 
        * epg.el (epg-start-encrypt): Extract primary key ID from

diff --git a/acinclude.m4 b/acinclude.m4
index 8172584..85d95ba 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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)])