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

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

diff --git a/ChangeLog b/ChangeLog
index fb5e396432a895a4161b240ac28cab938cedbcec..23eb2352cd5e697d5640d7e4b24cc0dd1a534f0f 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  Akim Demaille  <akim@epita.fr>
 
        * tests/torture.at (Exploding the Stack Size with Malloc):

diff --git a/src/Makefile.am b/src/Makefile.am
index 479bd977bdda4994202960f1529d1f1c85ed0a83..9ad2cc506fbfbe954be495ae518c528fb0a59ba8 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/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)
 
 
 /*-------------------------------.