Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined,

which is the case with --disabled-nls.

	* include/grub/i18n.h: Use (defined(ENABLE_NLS)
	&& ENABLE_NLS) instead of ENABLE_NLS in all #if preprocessor macros.
	* util/misc.c: Likewise.
	* util/mkisofs/mkisofs.c: Likewise.
	* util/mkisofs/mkisofs.h: Likewise.
This commit is contained in:
Grégoire Sutre 2010-03-27 12:19:32 +01:00 committed by Vladimir 'phcoder' Serbinenko
parent 969d1c782d
commit 394a3120a7
5 changed files with 21 additions and 10 deletions

View file

@ -604,10 +604,10 @@ make_system_path_relative_to_its_root (const char *path)
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) */
}
#endif