build-sys: nls/locale handling in util-linux-ng general

On Monday 03 September 2007, Karel Zak wrote:
> http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/590/focus=592
>
>  I agree that we need a better support for compilation without
>  locales, but from my point of view NLS != all locales stuff. The NLS
>  support is subset only.

thinking about the input from everyone, i'd propose the attached ...

Only pull in locale.h as needed and move it to the common nls.h.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2007-09-06 20:30:16 -04:00 committed by Karel Zak
parent 45be3f7d8d
commit 8b7f16fc37
8 changed files with 9 additions and 8 deletions

View File

@ -41,6 +41,7 @@ AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h], [], [], [
AC_CHECK_HEADERS(
[scsi/scsi.h \
langinfo.h \
locale.h \
sys/user.h \
rpcsvc/nfs_prot.h \
sys/io.h \

View File

@ -7,6 +7,13 @@ int main(int argc, char *argv[]);
#define LOCALEDIR "/usr/share/locale"
#endif
#ifdef HAVE_LOCALE_H
# include <locale.h>
#else
# undef setlocale
# define setlocale(Category, Locale) /* empty */
#endif
#ifdef ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
@ -16,7 +23,6 @@ int main(int argc, char *argv[]);
# define N_(String) (String)
# endif
#else
# include <locale.h>
# undef bindtextdomain
# define bindtextdomain(Domain, Directory) /* empty */
# undef textdomain

View File

@ -63,7 +63,6 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <locale.h>
#include "errs.h"
#include "nls.h"

View File

@ -59,7 +59,6 @@
#include <strings.h>
#include <ctype.h>
#include <getopt.h>
#include <locale.h>
#include "pathnames.h"
#include "nls.h"

View File

@ -54,7 +54,6 @@
#include <pwd.h>
#include <string.h>
#include <stdlib.h>
#include <locale.h>
#include <signal.h>
#include <sys/param.h>
#include <sys/signal.h>

View File

@ -40,8 +40,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
#include "nls.h"
#include "widechar.h"
/*

View File

@ -55,7 +55,6 @@
#include <sys/file.h>
#include <sys/wait.h>
#include <a.out.h>
#include <locale.h>
#include "xstrncpy.h"
#include "nls.h"
#include "widechar.h"

View File

@ -49,8 +49,6 @@
#include <unistd.h>
#include <signal.h>
#include <setjmp.h>
#include <locale.h>
#include <nl_types.h>
#include <libgen.h>
#ifdef HAVE_NCURSES_H