summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2003-09-03 07:23:15 +0000
committerManuel Novoa III <mjn3@codepoet.org>2003-09-03 07:23:15 +0000
commit037a01de617369e98025df7188da01dbe443d58d (patch)
tree5172a87d15636eae45553b1236a151de84bbaba8 /libc
parent2b525c3b4f713a390931a46016a164c691b173e0 (diff)
Some more buildroot-motivated fixes. Avoid installing some headers, as
well as stub libintl, depending on configuration.
Diffstat (limited to 'libc')
-rw-r--r--libc/misc/Makefile5
-rw-r--r--libc/misc/gnu/obstack.c3
2 files changed, 6 insertions, 2 deletions
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)