Mercurial > emacs
comparison lib-src/gettext.h @ 64639:385af3e03206
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Tue, 26 Jul 2005 21:43:13 +0000 |
parents | |
children | 6baf27bdd63b |
comparison
equal
deleted
inserted
replaced
64638:8cbdc86a4f55 | 64639:385af3e03206 |
---|---|
1 /* Convenience header for conditional use of GNU <libintl.h>. | |
2 Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc. | |
3 | |
4 This program is free software; you can redistribute it and/or modify | |
5 it under the terms of the GNU General Public License as published by | |
6 the Free Software Foundation; either version 2, or (at your option) | |
7 any later version. | |
8 | |
9 This program is distributed in the hope that it will be useful, | |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 GNU General Public License for more details. | |
13 | |
14 You should have received a copy of the GNU General Public License along | |
15 with this program; if not, write to the Free Software Foundation, | |
16 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | |
17 | |
18 #ifndef _LIBGETTEXT_H | |
19 #define _LIBGETTEXT_H 1 | |
20 | |
21 /* NLS can be disabled through the configure --disable-nls option. */ | |
22 #if ENABLE_NLS | |
23 | |
24 /* Get declarations of GNU message catalog functions. */ | |
25 # include <libintl.h> | |
26 | |
27 #else | |
28 | |
29 /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which | |
30 chokes if dcgettext is defined as a macro. So include it now, to make | |
31 later inclusions of <locale.h> a NOP. We don't include <libintl.h> | |
32 as well because people using "gettext.h" will not include <libintl.h>, | |
33 and also including <libintl.h> would fail on SunOS 4, whereas <locale.h> | |
34 is OK. */ | |
35 #if defined(__sun) | |
36 # include <locale.h> | |
37 #endif | |
38 | |
39 /* Many header files from the libstdc++ coming with g++ 3.3 or newer include | |
40 <libintl.h>, which chokes if dcgettext is defined as a macro. So include | |
41 it now, to make later inclusions of <libintl.h> a NOP. */ | |
42 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) | |
43 # include <cstdlib> | |
44 # if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H | |
45 # include <libintl.h> | |
46 # endif | |
47 #endif | |
48 | |
49 /* Disabled NLS. | |
50 The casts to 'const char *' serve the purpose of producing warnings | |
51 for invalid uses of the value returned from these functions. | |
52 On pre-ANSI systems without 'const', the config.h file is supposed to | |
53 contain "#define const". */ | |
54 # define gettext(Msgid) ((const char *) (Msgid)) | |
55 # define dgettext(Domainname, Msgid) ((const char *) (Msgid)) | |
56 # define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) | |
57 # define ngettext(Msgid1, Msgid2, N) \ | |
58 ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) | |
59 # define dngettext(Domainname, Msgid1, Msgid2, N) \ | |
60 ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) | |
61 # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ | |
62 ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) | |
63 # define textdomain(Domainname) ((const char *) (Domainname)) | |
64 # define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) | |
65 # define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) | |
66 | |
67 #endif | |
68 | |
69 /* A pseudo function call that serves as a marker for the automated | |
70 extraction of messages, but does not call gettext(). The run-time | |
71 translation is done at a different place in the code. | |
72 The argument, String, should be a literal string. Concatenated strings | |
73 and other string expressions won't work. | |
74 The macro's expansion is not parenthesized, so that it is suitable as | |
75 initializer for static 'char[]' or 'const char[]' variables. */ | |
76 #define gettext_noop(String) String | |
77 | |
78 #endif /* _LIBGETTEXT_H */ |