* src/system.h: Use intl/libgettext.h.

* src/Makefile.am (INCLUDES): Add -I $(top_srcdir).

diff --git a/ChangeLog b/ChangeLog
index e6847a1c8524d66346ca26dfae6f17dadc476117..00671e1e2e34102c897a69f5c4205aaf4afbeb94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-27  Akim Demaille  <akim@epita.fr>
+
+       * src/system.h: Use intl/libgettext.h.
+       * src/Makefile.am (INCLUDES): Add -I $(top_srcdir).
+
 2001-11-27  Paul Eggert  <eggert@twinsun.com>
 
        * src/bison.simple (YYSTACK_REALLOC): Fix typo that caused us to

diff --git a/src/Makefile.am b/src/Makefile.am
index b757258ef6d0a1040f84d33864aaa555ba9b8b81..54eea1497c2f2aff600101916f5bbd1d70c57abf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,14 @@ DEFS = @DEFS@ \
   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
-INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
-LDADD = @INTLLIBS@ ../lib/libbison.a
+# libintl.h in is build/intl, intl/libgettext.h in src/,
+# config.h in build/.
+INCLUDES = -I$(top_builddir)/intl \
+           -I$(top_builddir)      \
+           -I$(top_srcdir)/lib    \
+           -I$(top_srcdir)
+
+LDADD = $(INTLLIBS) ../lib/libbison.a
 
 bin_PROGRAMS = bison
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 6535ef167ad97e7f3b1b58518141fe49e927ed21..afb5b5303f5945708a2961a2f6df68b31e68079a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -108,8 +108,15 @@ DEFS = @DEFS@ \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 
-INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
-LDADD = @INTLLIBS@ ../lib/libbison.a
+# libintl.h in is build/intl, intl/libgettext.h in src/,
+# config.h in build/.
+INCLUDES = -I$(top_builddir)/intl \
+           -I$(top_builddir)      \
+           -I$(top_srcdir)/lib    \
+           -I$(top_srcdir)
+
+
+LDADD = $(INTLLIBS) ../lib/libbison.a
 
 bin_PROGRAMS = bison
 

diff --git a/src/system.h b/src/system.h
index 93213cb72c5e07a78d65bab459f9c56ef8e48b8f..70605c499fe5d76023d818e4e5293ca059807066 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -149,20 +149,9 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 # define setlocale(Category, Locale)
 #endif
 
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# undef  bindtextdomain
-# define bindtextdomain(Domain, Directory)
-# undef  textdomain
-# define textdomain(Domain)
-# undef  ngettext
-# define ngettext(Singular, Plural, Number)   \
-         ((Number == 1) ? Singular : Plural)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "intl/libgettext.h"
+#define _(Msgid)  gettext (Msgid)
+#define N_(Msgid) (Msgid)
 
 
 /*-------------------------------.