From 037a01de617369e98025df7188da01dbe443d58d Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Wed, 3 Sep 2003 07:23:15 +0000
Subject: Some more buildroot-motivated fixes.  Avoid installing some headers,
 as well as stub libintl, depending on configuration.

---
 libc/misc/Makefile      | 5 ++++-
 libc/misc/gnu/obstack.c | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'libc')

diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index 24a963516..875898259 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)Rules.mak
 
 DIRS = assert ctype dirent file fnmatch glob internals \
        mntent syslog time utmp sysvipc statfs \
-       error ttyent gnu search intl locale
+       error ttyent gnu search locale
 ifeq ($(strip $(UCLIBC_HAS_REGEX)),y)
 DIRS += regex
 endif
@@ -40,6 +40,9 @@ endif
 ifeq ($(strip $(UCLIBC_HAS_WCHAR)),y)
 DIRS += wctype wchar
 endif
+ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
+DIRS += intl
+endif
 
 all: libc.a
 
diff --git a/libc/misc/gnu/obstack.c b/libc/misc/gnu/obstack.c
index a3f7f3f45..0db0ad350 100644
--- a/libc/misc/gnu/obstack.c
+++ b/libc/misc/gnu/obstack.c
@@ -463,7 +463,8 @@ _obstack_memory_used (h)
 
 /* Define the error handler.  */
 # ifndef _
-#  if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+/* #  if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC */
+#  ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
 #   include <libintl.h>
 #   ifndef _
 #    define _(Str) __dcgettext (NULL, Str, LC_MESSAGES)
-- 
cgit v1.2.3