rw.rs ~charadon -- gnu-hello

gnu-hello

Info

Commit...:	3222728ee2a0b6012f34e5ab8b6f5686918c442b
Author...:	karl <>
Committer:	karl <>
Date.....:	Mon Nov 13 22:26:43 2006 +0000
Parents..:	7f0131cf03fd4e10ff131d75eb8fa0c5f2a721a2

Message

[project @ 2006-11-13 22:26:43 by karl]
#if ENABLE_NLS is back

Changes

diff --git a/src/ChangeLog b/src/ChangeLog
line changes: +6/-0
index 65108ca..9f4bb3c
--- a/src/ChangeLog
+++ b/src/ChangeLog

@@ -1,3 +1,9 @@
+2006-11-13  Karl Berry  <karl@gnu.org>
+
+	* hello.c (main): reinstall #if ENABLE_NLS, to avoid 
+        warnings with  --disable-nls CPPFLAGS=-Wall.  An alternative would
+	be to #define them away in system.h.  From Bruno Haible.
+
 2006-11-09  Eric Blake	<ebb9@byu.net>
 
 	* hello.c (main): Use atexit, to avoid warning with 'gcc -Wall

diff --git a/src/hello.c b/src/hello.c
line changes: +4/-1
index b579c9a..9bfbc88
--- a/src/hello.c
+++ b/src/hello.c

@@ -48,9 +48,11 @@ main (int argc, char *argv[])
   /* Set locale via LC_ALL.  */
   setlocale (LC_ALL, "");
 
+#if ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   /* Even exiting has subtleties.  The /dev/full device on GNU/Linux
      can be used for testing whether writes are checked properly.  For

@@ -62,7 +64,8 @@ main (int argc, char *argv[])
   while ((optc = getopt_long (argc, argv, "g:hntv", longopts, NULL)) != -1)
     switch (optc)
       {
-      /* One goal here is having --help and --version exit immediately.  */
+      /* One goal here is having --help and --version exit immediately,
+         per GNU coding standards.  */
       case 'v':
         print_version ();
         exit (EXIT_SUCCESS);