2007-01-05 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Add options --with-gpg-version and
	--with-gpgsm-version to allow overriding the minimum version
	requirements.

diff --git a/ChangeLog b/ChangeLog
index 83e47d497a36b0f44ba5a5d9b1a7ddaa254ff4a7..56eb778f0c900a5c6b90041da59868ebc29d7f90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-05  Marcus Brinkmann  <marcus@g10code.de>
+
+       * configure.ac: Add options --with-gpg-version and
+       --with-gpgsm-version to allow overriding the minimum version
+       requirements.
+
 2006-12-17  Marcus Brinkmann  <marcus@g10code.de>
 
        * configure.ac: Fix two typos in last change.

diff --git a/configure.ac b/configure.ac
index 581e05373ed598b6eed9b0526cb89cfd8597cdaf..8ba90c88d41a163460100b4441f32fb3edc642dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -56,9 +56,6 @@ LIBGPGME_LT_REVISION=1
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
-
-NEED_GPG_VERSION=1.3.0
-NEED_GPGSM_VERSION=1.9.6
 ##############################################
 
 
@@ -253,6 +250,30 @@ AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
 
 
 # Checks for system services
+NEED_GPG_VERSION_DEFAULT=1.3.0
+NEED_GPGSM_VERSION_DEFAULT=1.9.6
+NEED_GPG_VERSION="$NEED_GPG_VERSION_DEFAULT"
+NEED_GPGSM_VERSION="$NEED_GPGSM_VERSION_DEFAULT"
+AC_ARG_WITH(gpg-version,
+           AC_HELP_STRING([--with-gpg-version=VER], [require GnuPG version VER]),
+           NEED_GPG_VERSION=$withval)
+if test "$NEED_GPG_VERSION" = "yes"; then
+  NEED_GPG_VERSION="$NEED_GPG_VERSION_DEFAULT"
+fi
+if test "$NEED_GPG_VERSION" = "no"; then
+  NEED_GPG_VERSION=0.0.0
+fi
+AC_ARG_WITH(gpgsm-version,
+           AC_HELP_STRING([--with-gpgsm-version=VER], [require GPGSM version VER]),
+           NEED_GPGSM_VERSION=$withval)
+if test "$NEED_GPGSM_VERSION" = "yes"; then
+  NEED_GPGSM_VERSION="$NEED_GPGSM_VERSION_DEFAULT"
+fi
+if test "$NEED_GPGSM_VERSION" = "no"; then
+  NEED_GPGSM_VERSION=0.0.0
+fi
+
+
 NO_OVERRIDE=no
 AC_ARG_WITH(gpg,
            AC_HELP_STRING([--with-gpg=PATH], [use GnuPG binary at PATH]),