[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-36-g52c2a00

[Nikos Mavrogiannopoulos]

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=52c2a00c28c8f3e7e61a3f8f3b877e551c4d61e0

The branch, master has been updated
       via  52c2a00c28c8f3e7e61a3f8f3b877e551c4d61e0 (commit)
      from  bfedb373f4b53da3380d29177b3a20e8d133589a (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 52c2a00c28c8f3e7e61a3f8f3b877e551c4d61e0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Apr 17 23:09:04 2012 +0200

    Added option to unconditionally disable crywrap. Patch by Daniel Mierswa.

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

Summary of changes:
 configure.ac |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index cabee7e..1bca7e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,14 @@ AC_CHECK_FUNCS([alarm atexit dup2 epoll_create kqueue 
memchr memset munmap \
                putenv regcomp scandir select socket strcasecmp strchr \
                strdup strerror strncasecmp strrchr strstr strtoul uname])
 
-PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no])
+AC_ARG_ENABLE(crywrap,
+       AS_HELP_STRING([--disable-crywrap], [unconditionally disable the 
crywrap TLS proxy service]))
+
+ libidn=no
+
+ if test "x$enable_crywrap" != "xno" ; then
+       PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no])
+ fi
 
  if test "x$libidn" != "xno" && test "$ac_cv_func_daemon" != "no";then
   crywrap=yes


hooks/post-receive
-- 
GNU gnutls