From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Ben Key" Newsgroups: gmane.emacs.devel Subject: RE: No Gettext on Some Platforms Date: Fri, 6 Dec 2002 22:17:56 -0500 Sender: emacs-devel-admin@gnu.org Message-ID: <004b01c29d9f$3de3dee0$6501a8c0@GODDESS> References: Reply-To: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1039231584 30593 80.91.224.249 (7 Dec 2002 03:26:24 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sat, 7 Dec 2002 03:26:24 +0000 (UTC) Cc: Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18KVbi-0007xI-00 for ; Sat, 07 Dec 2002 04:26:22 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18KVkd-0006Oo-00 for ; Sat, 07 Dec 2002 04:35:35 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18KVTl-0000BV-00; Fri, 06 Dec 2002 22:18:09 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18KVTb-0008UO-00 for emacs-devel@gnu.org; Fri, 06 Dec 2002 22:17:59 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18KVTZ-0008QD-00 for emacs-devel@gnu.org; Fri, 06 Dec 2002 22:17:58 -0500 Original-Received: from smtp-server3.tampabay.rr.com ([65.32.1.41]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18KVTY-0008P3-00 for emacs-devel@gnu.org; Fri, 06 Dec 2002 22:17:56 -0500 Original-Received: from GODDESS (234-22.9-67.tampabay.rr.com [67.9.22.234]) by smtp-server3.tampabay.rr.com (8.12.2/8.12.2) with SMTP id gB73HtmD017175; Fri, 6 Dec 2002 22:17:55 -0500 (EST) Original-To: "'Andrew Choi'" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook CWS, Build 9.0.2416 (9.0.2911.0) In-reply-to: X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 Importance: Normal Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.devel:9951 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:9951 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 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: Contents of patch file This is important, especially in those cases in which the patch file has leading or trailing blank lines.