From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 22 Mar 2012 19:08:06 +0000 (+0100)
Subject: Revert "use header files from gl/ and include gettext.h"
X-Git-Tag: gnutls_3_0_18~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b8a83d03a3eb22860ce739adeb91b8039cd5a5c;p=thirdparty%2Fgnutls.git

Revert "use header files from gl/ and include gettext.h"

This reverts commit 6b3d7b6e31ddab337e185922910262d68f1fc6fa.
---

diff --git a/src/libopts/Makefile.am b/src/libopts/Makefile.am
index 2986ac15d6..33977a8e58 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 f40900f391..4c90c9dad0 100644
--- a/src/libopts/genshell.h
+++ b/src/libopts/genshell.h
@@ -141,7 +141,6 @@ extern tOptions genshelloptOptions;
 #if defined(ENABLE_NLS)
 # ifndef _
 #   include <stdio.h>
-#   include <gettext.h>
 static inline char* aoGetsText(char const* pz) {
     if (pz == NULL) return NULL;
     return (char*)gettext(pz);