diff options
| author | Mike Frysinger | 2007-09-07 02:30:16 +0200 |
|---|---|---|
| committer | Karel Zak | 2007-09-19 23:15:21 +0200 |
| commit | 8b7f16fc375a0314fe4d45c591706538a2c65871 (patch) | |
| tree | dc03b5dbeb448c40fcb7b25ec3bd80ed34ec1a78 | |
| parent | blockdev: add missing description about option --report in manpage (diff) | |
| download | kernel-qcow2-util-linux-8b7f16fc375a0314fe4d45c591706538a2c65871.tar.gz kernel-qcow2-util-linux-8b7f16fc375a0314fe4d45c591706538a2c65871.tar.xz kernel-qcow2-util-linux-8b7f16fc375a0314fe4d45c591706538a2c65871.zip | |
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>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/nls.h | 8 | ||||
| -rw-r--r-- | misc-utils/cal.c | 1 | ||||
| -rw-r--r-- | misc-utils/look.c | 1 | ||||
| -rw-r--r-- | misc-utils/write.c | 1 | ||||
| -rw-r--r-- | text-utils/colrm.c | 2 | ||||
| -rw-r--r-- | text-utils/more.c | 1 | ||||
| -rw-r--r-- | text-utils/pg.c | 2 |
8 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 6e212ea90..e7cfca3cd 100644 --- a/configure.ac +++ b/configure.ac @@ -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 \ diff --git a/include/nls.h b/include/nls.h index f571ca505..dd0440c9a 100644 --- a/include/nls.h +++ b/include/nls.h @@ -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 diff --git a/misc-utils/cal.c b/misc-utils/cal.c index f5ede93d6..77333d818 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -63,7 +63,6 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <locale.h> #include "errs.h" #include "nls.h" diff --git a/misc-utils/look.c b/misc-utils/look.c index 5c7e30c71..9e255965c 100644 --- a/misc-utils/look.c +++ b/misc-utils/look.c @@ -59,7 +59,6 @@ #include <strings.h> #include <ctype.h> #include <getopt.h> -#include <locale.h> #include "pathnames.h" #include "nls.h" diff --git a/misc-utils/write.c b/misc-utils/write.c index b3c96d14c..46b8f0acf 100644 --- a/misc-utils/write.c +++ b/misc-utils/write.c @@ -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> diff --git a/text-utils/colrm.c b/text-utils/colrm.c index 5e18a6ffa..e8b1ea4a4 100644 --- a/text-utils/colrm.c +++ b/text-utils/colrm.c @@ -40,8 +40,8 @@ #include <stdio.h> #include <stdlib.h> -#include <locale.h> +#include "nls.h" #include "widechar.h" /* diff --git a/text-utils/more.c b/text-utils/more.c index 19c441789..5dcae7b81 100644 --- a/text-utils/more.c +++ b/text-utils/more.c @@ -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" diff --git a/text-utils/pg.c b/text-utils/pg.c index 10bdd1593..3e1b25ea3 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -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 |