[svn] gpgme - r1200 - trunk

[svn author marcus]

Author: marcus
Date: 2007-01-05 18:16:03 +0100 (Fri, 05 Jan 2007)
New Revision: 1200

Modified:
   trunk/ChangeLog
   trunk/configure.ac
Log:
2007-01-05  Marcus Brinkmann  <marcus at g10code.de>

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


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-17 21:12:40 UTC (rev 1199)
+++ trunk/ChangeLog	2007-01-05 17:16:03 UTC (rev 1200)
@@ -1,3 +1,9 @@
+2007-01-05  Marcus Brinkmann  <marcus at 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 at g10code.de>
 
 	* configure.ac: Fix two typos in last change.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-12-17 21:12:40 UTC (rev 1199)
+++ trunk/configure.ac	2007-01-05 17:16:03 UTC (rev 1200)
@@ -56,9 +56,6 @@
 
 # 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 @@
 
 
 # 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]),