Skip to contentSkip to conversation

Fix use of ENABLE_NLS (which is not always defined)

PATCH In review Grégoire Sutre 2 participants 3 messages Jan 25, 2010 – Mar 17, 2010

lore
Share & tools
lore

Grégoire Sutre

author
#0 lore raw

PATCH 1/1 Fix use of ENABLE_NLS (which is not always defined)

Hi,

This message concerns both gnulib and grub. As discussed on irc and on the list [1], ENABLE_NLS is not used correctly, which leads to a build failure when gettext is not detected (or with configure option --disable-nls).

ENABLE_NLS is defined in AM_GNU_GETTEXT and the documentation of this macro [2] does not require ENABLE_NLS to be defined when gettext is not available. However, uses of ENABLE_NLS assume it to be defined, which is not correct.

The attached patch fixes the problem for grub.

For gnulib, running the following command on the source tree should solve the problem:

find . -name '*.[ch]' -exec sed -i -e 's, ENABLE_NLS, (defined(ENABLE_NLS) \&\& ENABLE_NLS),g' '{}' ';'

Best regards,

Grégoire

[1] http://lists.gnu.org/archive/html/grub-devel/2010-01/msg00288.html
[2] http://www.gnu.org/software/hello/manual/gettext/AM_005fGNU_005fGETTEXT.html

=== modified file 'ChangeLog'

ChangeLog +13 -0
@@ -1,5 +1,18 @@
 2010-01-25  Grégoire Sutre  <[email protected]>
 
+	Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined,
+	which is the case with --disabled-nls.
+
+	* gnulib/error.c: use (defined(ENABLE_NLS) && ENABLE_NLS) instead of
+	ENABLE_NLS in all #if preprocessor macros.
+	* gnulib/gettext.h: likewise.
+	* include/grub/i18n.h: likewise.
+	* util/misc.c: likewise.
+	* util/mkisofs/mkisofs.c: likewise.
+	* util/mkisofs/mkisofs.h: likewise.
+
+2010-01-25  Grégoire Sutre  <[email protected]>
+
 	* configure.ac: Check for `limits.h'.
 	* util/misc.c: Include `<limits.h>' (for PATH_MAX).

=== modified file 'gnulib/error.c'

error.c +1 -1
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if !_LIBC && ENABLE_NLS
+#if !_LIBC && (defined(ENABLE_NLS) && ENABLE_NLS)
 # include "gettext.h"
 # define _(msgid) gettext (msgid)
 #endif

=== modified file 'gnulib/gettext.h'

gettext.h +1 -1
@@ -19,7 +19,7 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
 
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>

=== modified file 'include/grub/i18n.h'

grub/i18n.h +3 -3
@@ -26,7 +26,7 @@
 extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
 
 # ifdef GRUB_UTIL
 

@@ -35,7 +35,7 @@
 
 # endif /* GRUB_UTIL */
 
-#else /* ! ENABLE_NLS */
+#else /* ! (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings

@@ -48,7 +48,7 @@
 #  define grub_gettext(str) ((const char *) (str))
 # endif /* GRUB_UTIL */
 
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 #ifdef GRUB_UTIL
 # define _(str) gettext(str)

=== modified file 'util/misc.c'

misc.c +2 -2
@@ -598,9 +598,9 @@
 void
 grub_util_init_nls (void)
 {
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 }

=== modified file 'util/mkisofs/mkisofs.c'

mkisofs/mkisofs.c +2 -2
@@ -640,11 +640,11 @@
   char *log_file = 0;
 
   set_program_name (argv[0]);
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 
   if (argc < 2)
     usage();

=== modified file 'util/mkisofs/mkisofs.h'

mkisofs/mkisofs.h +3 -3
@@ -30,12 +30,12 @@
 #include <prototyp.h>
 #include <sys/stat.h>
 
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
 
 #  include <locale.h>
 #  include <libintl.h>
 
-#else /* ! ENABLE_NLS */
+#else /* ! (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings

@@ -43,7 +43,7 @@
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
 #  define gettext(Msgid) ((const char *) (Msgid))
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 #define _(str) gettext(str)
 #define N_(str) str
#1 lore raw
Quoted 1 line · Grégoire Sutre

ENABLE_NLS is defined in AM_GNU_GETTEXT and the documentation of this macro [2] does not require ENABLE_NLS to be defined when gettext is not available. However, uses of ENABLE_NLS assume it to be defined, which is not correct.

Seems good for me, any objections ?

Yves Blusseau

author
#2 lore raw
In reply to Grégoire Sutre

Hi,

I just discovered your answers [1, 2] on this subject (I'm not registered to the bug-gnulib mailing list). Thanks for the explanations. I take note that Gnulib does not support use of -Wundef.

I just want to add that I find it good practice to avoid evaluating undefined identifiers in #if directives.

Quoted 2 lines

In fact, any package which makes good use of Autoconf cannot support -Wundef.

I don't see why. Could you please elaborate?

Best regards,

Grégoire Sutre

[1] http://lists.gnu.org/archive/html/bug-gnulib/2010-01/msg00316.html
[2] http://lists.gnu.org/archive/html/bug-gnulib/2010-01/msg00319.html