diff options
| author | Marcus Brinkmann <[email protected]> | 2007-01-05 17:16:03 +0000 | 
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-01-05 17:16:03 +0000 | 
| commit | 2a139abd8e5ab7b8500fa498da1a96ab2f508e27 (patch) | |
| tree | 416df7358a1a240290b2bb6b0ee3e6ea044819db | |
| parent | 2006-12-17 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-2a139abd8e5ab7b8500fa498da1a96ab2f508e27.tar.gz gpgme-2a139abd8e5ab7b8500fa498da1a96ab2f508e27.zip | |
2007-01-05  Marcus Brinkmann  <[email protected]>
	* configure.ac: Add options --with-gpg-version and
	--with-gpgsm-version to allow overriding the minimum version
	requirements.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 27 | 
2 files changed, 30 insertions, 3 deletions
| @@ -1,3 +1,9 @@ +2007-01-05  Marcus Brinkmann  <[email protected]> + +	* configure.ac: Add options --with-gpg-version and +	--with-gpgsm-version to allow overriding the minimum version +	requirements. +  2006-12-17  Marcus Brinkmann  <[email protected]>  	* configure.ac: Fix two typos in last change. diff --git a/configure.ac b/configure.ac index 581e0537..8ba90c88 100644 --- 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]), | 
