[gmime] bumped min req'd version of GpgME to 1.6.0 (will prob up it to 1.8.0 later)



commit 5addcccc9525d1ade2d4409055576bad2a29770f
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Mon Feb 6 14:30:20 2017 -0500

    bumped min req'd version of GpgME to 1.6.0 (will prob up it to 1.8.0 later)

 autogen.sh   |    4 ++--
 configure.ac |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index f8e0227..55c643a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -57,7 +57,7 @@ fi
        DIE=1
 }
 
-for automake_version in 1.9 1.10 1.11 1.12 1.13 1.14 1.15 1.16; do
+for automake_version in 1.14 1.15 1.16; do
     if automake-${automake_version} --version < /dev/null > /dev/null 2>&1 ; then
         AUTOMAKE=automake-${automake_version}
         ACLOCAL=aclocal-${automake_version}
@@ -100,7 +100,7 @@ $AUTOMAKE --add-missing || exit $?
 autoconf || exit $?
 cd $ORIGDIR || exit $?
 
-if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "NOCONFIGURE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
         $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
 
         echo 
diff --git a/configure.ac b/configure.ac
index 67a7fca..f612d36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
-# require autoconf 2.54
-AC_PREREQ(2.54)
+# require autoconf 2.69
+AC_PREREQ(2.69)
 
 # Making releases:
 #   gmime_micro_version += 1;
@@ -558,7 +558,7 @@ AC_ARG_ENABLE([crypto],
 
 m4_ifdef([AM_PATH_GPGME_PTHREAD], [
 AS_IF([test "x$enable_crypto" = "xyes"], [
-   AM_PATH_GPGME_PTHREAD(1.1.6, enable_crypto="yes (via GpgME)", enable_crypto="no")
+   AM_PATH_GPGME_PTHREAD(1.6.0, enable_crypto="yes (via GpgME)", enable_crypto="no")
    if test "x$enable_crypto" != "xno"; then
       AC_DEFINE(ENABLE_CRYPTO, 1, [Define if GMime should enable GpgME PGP and S/MIME support.])
    fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]