No Gettext on Some Platforms

No Gettext on Some Platforms

[Andrew Choi]

A recent change to lib-src/getopt.c causes link failure on platforms
without gettext installed.  Please consider the following fix.

Index: getopt.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/getopt.c,v
retrieving revision 1.21
diff -u -r1.21 getopt.c
--- getopt.c    5 Dec 2002 15:30:09 -0000       1.21
+++ getopt.c    6 Dec 2002 17:32:51 -0000
@@ -83,7 +83,11 @@
 # include "gettext.h"
 #endif
 #endif
+#ifdef HAVE_LIBINTL_H
 #define _(msgid) gettext (msgid)
+#else
+#define _(msgid) (msgid)
+#endif
 
 #if defined _LIBC && defined USE_IN_LIBIO
 # include <wchar.h>

RE: No Gettext on Some Platforms

[Ben Key]

Andrew Choi [akochoi@shaw.ca] wrote:
  > A recent change to lib-src/getopt.c causes link failure on platforms
  > without gettext installed.  Please consider the following fix.
  >
  > Index: getopt.c
  > ===================================================================
  > RCS file: /cvsroot/emacs/emacs/lib-src/getopt.c,v
  > retrieving revision 1.21
  > diff -u -r1.21 getopt.c
  > --- getopt.c    5 Dec 2002 15:30:09 -0000       1.21
  > +++ getopt.c    6 Dec 2002 17:32:51 -0000
  > @@ -83,7 +83,11 @@
  >  # include "gettext.h"
  >  #endif
  >  #endif
  > +#ifdef HAVE_LIBINTL_H
  >  #define _(msgid) gettext (msgid)
  > +#else
  > +#define _(msgid) (msgid)
  > +#endif
  >
  >  #if defined _LIBC && defined USE_IN_LIBIO
  >  # include <wchar.h>

Thank you.  I have been trying to figure out a way to fix this problem on
Windows that would not break the build on other platforms since yesterday.
It looks like your patch will do the trick.  If this patch fixes make
bootstrap on Windows without breaking the build on Gnu/Linux, I will apply
your patch tonight.

In the future, when submitting a patch by including the text within your
email message, could you tag the beginning and the end of the patch as
follows:
<patch>
Contents of patch file
</patch>

This is important, especially in those cases in which the patch file has
leading or trailing blank lines.

Re: No Gettext on Some Platforms

[Miles Bader]

On Fri, Dec 06, 2002 at 10:17:56PM -0500, Ben Key wrote:
> In the future, when submitting a patch by including the text within your
> email message, could you tag the beginning and the end of the patch as
> follows:
> <patch>
> Contents of patch file
> </patch>
> 
> This is important, especially in those cases in which the patch file has
> leading or trailing blank lines.

The `patch' program will quite happily accept an entire email message as
input, and find the patch itself, so something like the above is usually not
necessary.

-Miles
-- 
[|nurgle|]  ddt- demonic? so quake will have an evil kinda setting? one that 
            will  make every christian in the world foamm at the mouth? 
[iddt]      nurg, that's the goal