Scrub away the last leftovers from BB_FEATURE_<shell>. Good thing
for multibuild.pl -- I would have missed this stupid mess otherwise.
-Erik
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 020f89d..7fe9f95 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -391,6 +391,19 @@
// Nothing beyond this point should ever be touched by
// mere mortals so leave this stuff alone.
//
+#include <features.h>
+#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
+ #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */
+ #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */
+ #undef BB_ASH /* Uses fork() */
+ #undef BB_HUSH /* Uses fork() */
+ #undef BB_LASH /* Uses fork() */
+ #undef BB_INIT /* Uses fork() */
+ #undef BB_FEATURE_TAR_GZIP /* Uses fork() */
+ #undef BB_SYSLOGD /* Uses daemon() */
+ #undef BB_KLOGD /* Uses daemon() */
+ #undef BB_UPDATE /* Uses daemon() */
+#endif
#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
#if defined BB_FEATURE_COMMAND_EDITING
#define BB_CMDEDIT
@@ -400,26 +413,6 @@
#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
#undef BB_FEATURE_SH_FANCY_PROMPT
#endif
- #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH
- #define BB_FEATURE_MSH
- #endif
- #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
- #undef BB_FEATURE_LASH
- #undef BB_FEATURE_HUSH
- #undef BB_FEATURE_MSH
- #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
- #undef BB_FEATURE_LASH
- #undef BB_FEATURE_HUSH
- #undef BB_FEATURE_ASH
- #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
- #undef BB_FEATURE_LASH
- #undef BB_FEATURE_MSH
- #undef BB_FEATURE_ASH
- #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
- #undef BB_FEATURE_HUSH
- #undef BB_FEATURE_MSH
- #undef BB_FEATURE_ASH
- #endif
#else
#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
#undef BB_FEATURE_SH_STANDALONE_SHELL
@@ -471,3 +464,4 @@
# define BB_SH
# define shell_main msh_main
#endif
+