[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.1.9-202-g3be12d1

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  3be12d1e1b8334fb2bba307ec9efbc004f1dbf8d (commit)
      from  fdd2cc5f3b257bac056992b79623310bb0b494d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3be12d1e1b8334fb2bba307ec9efbc004f1dbf8d
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 1 08:04:49 2015 +0100

    build: Let configure show the the status of Tor support
    
    * configure.ac (show_tor_support): New
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index d9aac71..bd84633 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,8 @@ use_ccid_driver=yes
 dirmngr_auto_start=yes
 use_tls_library=no
 large_secmem=no
+show_tor_support=no
+
 
 GNUPG_BUILD_PROGRAM(gpg, yes)
 GNUPG_BUILD_PROGRAM(gpgsm, yes)
@@ -755,10 +757,29 @@ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
 if test "$have_libassuan" = "yes"; then
   AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version",
                      [version of the libassuan library])
+  # Starting with 2.4.1 we have Tor support in Libassuan.  */
+  ok=no
+  if test "$libassuan_version_major" -gt "2"; then
+    ok=yes
+  else
+    if test "$libassuan_version_major" -eq "2"; then
+      if test "$libassuan_version_minor" -gt "4"; then
+        ok=yes
+      else
+        if test "$libassuan_version_minor" -eq "4"; then
+          if test "$libassuan_version_micro" -ge "1"; then
+            ok=yes
+          fi
+        fi
+      fi
+    fi
+  fi
+  if test $ok = yes ;then
+    show_tor_support="only .onion"
+  fi
 fi
 
 
-
 #
 # libksba is our X.509 support library
 #
@@ -955,6 +976,9 @@ if test "$with_adns" != "no"; then
   AC_MSG_RESULT($adns_if_tormode)
   if test x"$adns_if_tormode" = xyes; then
     AC_DEFINE(HAVE_ADNS_IF_TORMODE,1,[define if adns_if_tormode is available])
+    if test "$show_tor_support" != "no"; then
+      show_tor_support=yes
+    fi
   fi
 fi
 CPPFLAGS=${_cppflags}
@@ -1853,6 +1877,7 @@ echo "
         DNS SRV support:     $use_dns_srv
         TLS support:         $use_tls_library
         TOFU support:        $use_tofu
+        Tor support:         $show_tor_support
 "
 if test x"$use_regex" != xyes ; then
 echo "

-----------------------------------------------------------------------

Summary of changes:
 configure.ac | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org