X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=acinclude.m4;h=85d95ba10282213a96728da7da6ead8e9840fb09;hb=8335b14c224a471662db08aea206666c26147bf8;hp=fc6c9cc283527428de866a3850187f453ad16afb;hpb=641bae17bb9a682888af556e671ff881d15bb552;p=elisp%2Fepg.git

diff --git a/acinclude.m4 b/acinclude.m4
index fc6c9cc..85d95ba 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -358,16 +358,23 @@ AC_DEFUN([AC_ADD_LOAD_PATH],
     ADDITIONAL_LOAD_PATH=)
   AC_SUBST(ADDITIONAL_LOAD_PATH)])
 
-AC_DEFUN([AC_PATH_GPG],
- [AC_PATH_PROG(GPG, gpg)
-  AC_ARG_WITH(gpg,
-  AC_HELP_STRING([--with-gpg=PATH], [use GnuPG binary at PATH]),
-        GPG=$withval, NO_OVERRIDE=yes)
-  AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG", [Path to the GnuPG binary.])
-  AC_SUBST(GPG)
+AC_DEFUN([AC_CHECK_GPG],
+ [AC_ARG_ENABLE(gpgtest,
+  AC_HELP_STRING([--disable-gpgtest=PATH], [Do not check GnuPG version]),
+    enable_gpgtest=yes)
+  ok=maybe
+  if test "x$enable_gpgtest" = "xyes"; then
+    ok=yes
+  else
+    AC_PATH_PROG(GPG, gpg)
+    AC_ARG_WITH(gpg,
+      AC_HELP_STRING([--with-gpg=PATH], [use GnuPG binary at PATH]),
+      GPG=$withval)
+    AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG", [Path to the GnuPG binary.])
+    AC_SUBST(GPG)
+  fi
   dnl Check for GnuPG version requirement.
   GPG_VERSION=unknown
-  ok=maybe
   if test -z "$GPG" -o "x$GPG" = "xno"; then
     ok=no
   else
@@ -384,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 | \
@@ -410,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)])