aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2005-09-05 04:13:33 +0000
committerGravatar Rob Landley <rob@landley.net>2005-09-05 04:13:33 +0000
commit8a7a678b0307f8390986f7020aea96b7927b72f4 (patch)
tree01fe0baffd683abaa750b63ee80ddced47dd608e /scripts
parenta1a1a9fa2c9b9e15ad15d3a33cc08d3696d01f3f (diff)
downloadbusybox-8a7a678b0307f8390986f7020aea96b7927b72f4.tar.gz
busybox-8a7a678b0307f8390986f7020aea96b7927b72f4.tar.bz2
Fixes so "make allnoconfig" works again.
The configure system's save function edited out sub-menus that wouldn't be displayed in the current configuration, meaning config.h wouldn't have #udef entries for those symbols, meaning bb_config.h would have the relevant ENABLE_ missing instead of defined to 0. This broke the build. So I fixed it, and then reorganized the applets.c and busybox.c to take away the warnings this revealed (code that would be optimized out was making calls to functions that hadn't been prototyped. So I added an #else case to those #ifdefs to #define the relevant functions to empty macros to placate the warnings. I also reorganized the applets.c code to make adding such an #else case less of a pain (and make the need for prototyping go away by moving the functions up before they were used, and generally wind up with fewer #ifdefs in the code by putting all the logic in one place). This resulted in a huge seeming patch, when most if it just moves code from one place to another without touching it... Upside: make allyesconfig and make allnoconfig should both work now.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config/confdata.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index 0a1f085ae..1d1b61e2b 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -322,8 +322,8 @@ int conf_write(const char *name)
while (menu) {
sym = menu->sym;
if (!sym) {
- if (!menu_is_visible(menu))
- goto next;
+ //if (!menu_is_visible(menu))
+ // goto next;
str = menu_get_prompt(menu);
fprintf(out, "\n"
"#\n"
@@ -336,8 +336,8 @@ int conf_write(const char *name)
" */\n", str);
} else if (!(sym->flags & SYMBOL_CHOICE)) {
sym_calc_value(sym);
- if (!(sym->flags & SYMBOL_WRITE))
- goto next;
+ //if (!(sym->flags & SYMBOL_WRITE))
+ // goto next;
sym->flags &= ~SYMBOL_WRITE;
type = sym->type;
if (type == S_TRISTATE) {