Added --disable-gpgtest option.

diff --git a/acinclude.m4 b/acinclude.m4
index fc6c9cc..51c2cda 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -359,15 +359,22 @@ AC_DEFUN([AC_ADD_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_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