* src/Makefile.am (INCLUDES): Add -I $(top_srcdir).
+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):
-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
# 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)
/*-------------------------------.