[SCM] GNU gnutls branch, master, updated. gnutls_3_1_4-43-g7150a90

[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=7150a903a274492f88b4580d26c667ddc40fee67

The branch, master has been updated
       via  7150a903a274492f88b4580d26c667ddc40fee67 (commit)
      from  06695cdb6af5642c821b726d916668c570bc8b93 (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 7150a903a274492f88b4580d26c667ddc40fee67
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Nov 20 09:07:31 2012 +0100

    check for either iconv or libiconv.

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

Summary of changes:
 NEWS            |    3 ++-
 configure.ac    |    1 +
 lib/Makefile.am |    2 +-
 lib/system.c    |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 289b955..dad8b2d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,8 @@ See the end for copying conditions.
 ** libgnutls: Added functions to parse the certificates policies
 extension.
 
-** libgnutls: Handle BMPString (UCS-2) encoding in the DN.
+** libgnutls: Handle BMPString (UCS-2) encoding in the Distinguished
+Name by translating it to UTF-8 (works on windows or systems with libiconv).
 
 ** libgnutls: Added PKCS #11 key generation function that returns the 
 public key on generation.
diff --git a/configure.ac b/configure.ac
index 8ee03b3..64888e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,6 +202,7 @@ dnl No fork on MinGW, disable some self-tests until we fix 
them.
 AC_CHECK_FUNCS([fork getrusage getpwuid_r daemon iconv],,)
 AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no")
 AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock 
(0);])
+AC_LIB_HAVE_LINKFLAGS(iconv,, [#include <iconv.h>], [iconv_open (0,0);])
 
 AC_MSG_CHECKING([whether to build libdane])
 AC_ARG_ENABLE(libdane,
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3b7b7ab..9e78474 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -123,7 +123,7 @@ libgnutls_la_LIBADD = ../gl/libgnu.la 
x509/libgnutls_x509.la \
        auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
        extras/libgnutls_extras.la
 thirdparty_libadd = $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
-       $(LTLIBPTHREAD) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_LIBS)
+       $(LTLIBPTHREAD) $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_LIBS)
 
 if ENABLE_OPENPGP
 libgnutls_la_LIBADD += openpgp/libgnutls_openpgp.la
diff --git a/lib/system.c b/lib/system.c
index dcca145..b2eee24 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -473,7 +473,7 @@ 
gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list,
 #endif
 }
 
-#if defined(HAVE_ICONV)
+#if defined(HAVE_ICONV) || defined(HAVE_LIBICONV)
 
 # include <iconv.h>
 


hooks/post-receive
-- 
GNU gnutls