diff options
| author | Werner Koch <[email protected]> | 2015-12-01 07:04:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-12-01 07:04:49 +0000 |
| commit | 3be12d1e1b8334fb2bba307ec9efbc004f1dbf8d (patch) | |
| tree | 613b262747e6588c1a66a4aadba0bdab4f8f9961 | |
| parent | doc: Clarify dirmngr's --keyserver option. (diff) | |
| download | gnupg-3be12d1e1b8334fb2bba307ec9efbc004f1dbf8d.tar.gz gnupg-3be12d1e1b8334fb2bba307ec9efbc004f1dbf8d.zip | |
build: Let configure show the the status of Tor support
* configure.ac (show_tor_support): New
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d9aac71cb..bd84633c0 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 " |