[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: Both: Gettext
From: |
Akim Demaille |
Subject: |
FYI: Both: Gettext |
Date: |
27 Nov 2001 20:20:56 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Artificial Intelligence) |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/system.h: Use intl/libgettext.h.
* src/Makefile.am (INCLUDES): Add -I $(top_srcdir).
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/src/Makefile.am,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile.am
--- src/Makefile.am 2001/08/06 09:22:33 1.25
+++ src/Makefile.am 2001/11/27 19:20:28
@@ -5,8 +5,14 @@
-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
Index: src/system.h
===================================================================
RCS file: /cvsroot/bison/bison/src/system.h,v
retrieving revision 1.23.2.8
diff -u -u -r1.23.2.8 system.h
--- src/system.h 2001/11/23 14:13:19 1.23.2.8
+++ src/system.h 2001/11/27 19:20:28
@@ -149,20 +149,9 @@
# 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)
/*-------------------------------.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: Both: Gettext,
Akim Demaille <=