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>

diff --git a/configure.ac b/configure.ac
index e2bb828411de2cb3b12a854f56e425b4a07f6949..d073be13fa00d526779b2ac31132e6c23b0b9012 100644 (file)
--- 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 f571ca5058f061c9d0c0b4064abc3cda3645a167..dd0440c9a3e1aba08df0dc540a037c6cd8a98272 100644 (file)
--- 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 f5ede93d61ed83563e173e4040aa198692c0c618..77333d8183f1d58bf3a29c0b95195e8c67171264 100644 (file)
--- 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 5c7e30c71f4e63f0f14562e29d05492179f7c4d1..9e255965cd636132130d931653a9daa0508ea257 100644 (file)
--- 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 b3c96d14caf669799ed1451e8ca842f0789b3c5c..46b8f0acf2d728e0aecc286f68444bb56352430d 100644 (file)
--- 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 5e18a6ffaefb229498c119daf0861e2a0d6b619c..e8b1ea4a4f3cdaac9ecd582842f6bb75a35d923a 100644 (file)
--- 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 19c441789fa06ed2978eaf3e4b15b0825b368447..5dcae7b817935319617960ddebf8648ad7350903 100644 (file)
--- 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 10bdd1593ba5d43884b56115f686b4cd130f8749..3e1b25ea345b0189490bb2e85969cd28eb562311 100644 (file)
--- 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