X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=acinclude.m4;h=85d95ba10282213a96728da7da6ead8e9840fb09;hb=08382c199d251e641ae14800f7b5c8f0afaac831;hp=51c2cda9e1fd3cbe67366c1965d97395c0cd3863;hpb=b9556b69822cb8dc4770873ce4e704d2155c2974;p=elisp%2Fepg.git

diff --git a/acinclude.m4 b/acinclude.m4
index 51c2cda..85d95ba 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -358,7 +358,7 @@ AC_DEFUN([AC_ADD_LOAD_PATH],
     ADDITIONAL_LOAD_PATH=)
   AC_SUBST(ADDITIONAL_LOAD_PATH)])
 
-AC_DEFUN([AC_PATH_GPG],
+AC_DEFUN([AC_CHECK_GPG],
  [AC_ARG_ENABLE(gpgtest,
   AC_HELP_STRING([--disable-gpgtest=PATH], [Do not check GnuPG version]),
     enable_gpgtest=yes)
@@ -391,7 +391,7 @@ AC_DEFUN([AC_PATH_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_PATH_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)])