summaryrefslogtreecommitdiffstats
path: root/gettext-runtime/intl
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2005-12-28 14:06:29 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:12:58 +0200
commitcd7c271ae00b0d39894a5a99021a5eec66595d2d (patch)
treecd4be5c881aab01ad024a5cd54ada432adb2820f /gettext-runtime/intl
parent1cdbca921a7800977b63bb217d91f8fb80b97254 (diff)
downloadexternal_gettext-cd7c271ae00b0d39894a5a99021a5eec66595d2d.zip
external_gettext-cd7c271ae00b0d39894a5a99021a5eec66595d2d.tar.gz
external_gettext-cd7c271ae00b0d39894a5a99021a5eec66595d2d.tar.bz2
Fix compilation error when plural.c is generated by bison-2.1.
Diffstat (limited to 'gettext-runtime/intl')
-rw-r--r--gettext-runtime/intl/ChangeLog6
-rw-r--r--gettext-runtime/intl/Makefile.in5
2 files changed, 11 insertions, 0 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 5d5a268..129f704 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-25 Bruno Haible <bruno@clisp.org>
+
+ Fix compilation error when plural.c is generated by bison-2.1.
+ * Makefile.in (PLURAL_DEPS_yes, PLURAL_DEPS_no): New macros.
+ (plural.$lo): Add conditional dependency to libintl.h.
+
2005-12-04 Bruno Haible <bruno@clisp.org>
Cygwin portability.
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index dd91102..e8badc6 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -473,6 +473,11 @@ bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo loc
localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
+# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS.
+PLURAL_DEPS_yes = libintl.h
+PLURAL_DEPS_no =
+plural.$lo: $(PLURAL_DEPS_@USE_INCLUDED_LIBINTL@)
+
tags: TAGS
TAGS: $(HEADERS) $(SOURCES)