[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-31-g207230b

[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=207230b72a2c9df950ef53a1b8c469a823749830

The branch, master has been updated
       via  207230b72a2c9df950ef53a1b8c469a823749830 (commit)
       via  7b8a83d03a3eb22860ce739adeb91b8039cd5a5c (commit)
      from  6b3d7b6e31ddab337e185922910262d68f1fc6fa (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 207230b72a2c9df950ef53a1b8c469a823749830
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 22 20:10:17 2012 +0100

    include libintl. Patch by B. Scott Michel

commit 7b8a83d03a3eb22860ce739adeb91b8039cd5a5c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 22 20:08:06 2012 +0100

    Revert "use header files from gl/ and include gettext.h"
    
    This reverts commit 6b3d7b6e31ddab337e185922910262d68f1fc6fa.

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

Summary of changes:
 src/libopts/Makefile.am |    2 +-
 src/libopts/genshell.h  |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libopts/Makefile.am b/src/libopts/Makefile.am
index 2986ac1..33977a8 100644
--- a/src/libopts/Makefile.am
+++ b/src/libopts/Makefile.am
@@ -6,7 +6,7 @@ else
 noinst_LTLIBRARIES      = libopts.la
 endif
 libopts_la_SOURCES      = libopts.c
-libopts_la_CPPFLAGS     = -I$(top_srcdir) -I$(top_srcdir)/gl
+libopts_la_CPPFLAGS     = -I$(top_srcdir)
 libopts_la_LDFLAGS      = -version-info  36:3:11
 EXTRA_DIST              = \
     ag-char-map.h           alias.c                 ao-strs.c  \
diff --git a/src/libopts/genshell.h b/src/libopts/genshell.h
index f40900f..1115d8f 100644
--- a/src/libopts/genshell.h
+++ b/src/libopts/genshell.h
@@ -140,8 +140,10 @@ extern tOptions genshelloptOptions;
 
 #if defined(ENABLE_NLS)
 # ifndef _
+#   if defined(HAVE_GETTEXT)
+#     include <libintl.h>
+#   endif
 #   include <stdio.h>
-#   include <gettext.h>
 static inline char* aoGetsText(char const* pz) {
     if (pz == NULL) return NULL;
     return (char*)gettext(pz);


hooks/post-receive
-- 
GNU gnutls