From: Jim Meyering <jim@meyering.net>
Date: Fri, 22 Nov 2002 10:28:44 +0000 (+0000)
Subject: Change compile-time error message. Add comment about
X-Git-Tag: v4.5.4~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70641e502dc2c5efdf2019bf86232acb7c4b5907;p=thirdparty%2Fcoreutils.git

Change compile-time error message. Add comment about
required autoconf version.

Include gettext.h instead of <libintl.h>.
(textdomain): Remove definition.
---

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index bc6c0bd14a..3affee7a9a 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -30,14 +30,9 @@ void *realloc ();
 void free ();
 #endif
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define textdomain(Domain)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
 
 #include "error.h"
 #include "xalloc.h"
@@ -46,12 +41,14 @@ void free ();
 # define EXIT_FAILURE 1
 #endif
 
+/* The following tests require AC_PREREQ(2.54).  */
+
 #ifndef HAVE_MALLOC
-"you must run the autoconf test for a properly working malloc"
+"you must run the autoconf test for a GNU libc compatible malloc"
 #endif
 
 #ifndef HAVE_REALLOC
-"you must run the autoconf test for a properly working realloc"
+"you must run the autoconf test for a GNU libc compatible realloc"
 #endif
 
 /* Exit value when the requested amount of memory is not available.