diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /scripts | |
parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/Makefile | 9 | ||||
-rw-r--r-- | scripts/kconfig/lkc.h | 8 | ||||
-rw-r--r-- | scripts/kconfig/mconf.c | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 2fcb244a9e18..0dd96919de3e 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -116,6 +116,15 @@ endif | |||
116 | clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ | 116 | clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ |
117 | .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c | 117 | .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c |
118 | 118 | ||
119 | # Needed for systems without gettext | ||
120 | KBUILD_HAVE_NLS := $(shell \ | ||
121 | if echo "\#include <libint.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \ | ||
122 | then echo yes ; \ | ||
123 | else echo no ; fi) | ||
124 | ifeq ($(KBUILD_HAVE_NLS),no) | ||
125 | HOSTCFLAGS += -DKBUILD_NO_NLS | ||
126 | endif | ||
127 | |||
119 | # generated files seem to need this to find local include files | 128 | # generated files seem to need this to find local include files |
120 | HOSTCFLAGS_lex.zconf.o := -I$(src) | 129 | HOSTCFLAGS_lex.zconf.o := -I$(src) |
121 | HOSTCFLAGS_zconf.tab.o := -I$(src) | 130 | HOSTCFLAGS_zconf.tab.o := -I$(src) |
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index c3d25786a64d..5fba1feff2a8 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -8,7 +8,13 @@ | |||
8 | 8 | ||
9 | #include "expr.h" | 9 | #include "expr.h" |
10 | 10 | ||
11 | #include <libintl.h> | 11 | #ifndef KBUILD_NO_NLS |
12 | # include <libintl.h> | ||
13 | #else | ||
14 | # define gettext(Msgid) ((const char *) (Msgid)) | ||
15 | # define textdomain(Domainname) ((const char *) (Domainname)) | ||
16 | # define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) | ||
17 | #endif | ||
12 | 18 | ||
13 | #ifdef __cplusplus | 19 | #ifdef __cplusplus |
14 | extern "C" { | 20 | extern "C" { |
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 457bec29511d..d1ad40531ee5 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -219,6 +219,7 @@ save_config_help[] = N_( | |||
219 | search_help[] = N_( | 219 | search_help[] = N_( |
220 | "\n" | 220 | "\n" |
221 | "Search for CONFIG_ symbols and display their relations.\n" | 221 | "Search for CONFIG_ symbols and display their relations.\n" |
222 | "Regular expressions are allowed.\n" | ||
222 | "Example: search for \"^FOO\"\n" | 223 | "Example: search for \"^FOO\"\n" |
223 | "Result:\n" | 224 | "Result:\n" |
224 | "-----------------------------------------------------------------\n" | 225 | "-----------------------------------------------------------------\n" |
@@ -531,7 +532,7 @@ again: | |||
531 | cprint("--title"); | 532 | cprint("--title"); |
532 | cprint(_("Search Configuration Parameter")); | 533 | cprint(_("Search Configuration Parameter")); |
533 | cprint("--inputbox"); | 534 | cprint("--inputbox"); |
534 | cprint(_("Enter Keyword")); | 535 | cprint(_("Enter CONFIG_ (sub)string to search for (omit CONFIG_)")); |
535 | cprint("10"); | 536 | cprint("10"); |
536 | cprint("75"); | 537 | cprint("75"); |
537 | cprint(""); | 538 | cprint(""); |