Ok, if no shell is enabled, don't include any of the SH_IS_<name>

options or the build will fail
 -Erik

diff --git a/applets.h b/applets.h
index 184bce09b0ae22854b8ac91dd44170cfcb569344..a26a06e21dbeacab97890852cfa743007912e534 100644 (file)
--- a/applets.h
+++ b/applets.h
@@ -356,13 +356,13 @@
 #ifdef BB_SETKEYCODES
        APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN)
 #endif
-#ifdef BB_FEATURE_SH_IS_ASH
+#if defined(BB_FEATURE_SH_IS_ASH) && defined(BB_ASH)
        APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN)
-#elif defined(BB_FEATURE_SH_IS_HUSH)
+#elif defined(BB_FEATURE_SH_IS_HUSH) && defined(BB_HUSH)
        APPLET_NOUSAGE("sh", hush_main, _BB_DIR_BIN)
-#elif defined(BB_FEATURE_SH_IS_LASH)
+#elif defined(BB_FEATURE_SH_IS_LASH) && defined(BB_LASH)
        APPLET_NOUSAGE("sh", lash_main, _BB_DIR_BIN)
-#elif defined(BB_FEATURE_SH_IS_MSH)
+#elif defined(BB_FEATURE_SH_IS_MSH) && defined(BB_MSH)
        APPLET_NOUSAGE("sh", msh_main, _BB_DIR_BIN)
 #endif
 #ifdef BB_SLEEP

diff --git a/include/applets.h b/include/applets.h
index 184bce09b0ae22854b8ac91dd44170cfcb569344..a26a06e21dbeacab97890852cfa743007912e534 100644 (file)
--- a/include/applets.h
+++ b/include/applets.h
@@ -356,13 +356,13 @@
 #ifdef BB_SETKEYCODES
        APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN)
 #endif
-#ifdef BB_FEATURE_SH_IS_ASH
+#if defined(BB_FEATURE_SH_IS_ASH) && defined(BB_ASH)
        APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN)
-#elif defined(BB_FEATURE_SH_IS_HUSH)
+#elif defined(BB_FEATURE_SH_IS_HUSH) && defined(BB_HUSH)
        APPLET_NOUSAGE("sh", hush_main, _BB_DIR_BIN)
-#elif defined(BB_FEATURE_SH_IS_LASH)
+#elif defined(BB_FEATURE_SH_IS_LASH) && defined(BB_LASH)
        APPLET_NOUSAGE("sh", lash_main, _BB_DIR_BIN)
-#elif defined(BB_FEATURE_SH_IS_MSH)
+#elif defined(BB_FEATURE_SH_IS_MSH) && defined(BB_MSH)
        APPLET_NOUSAGE("sh", msh_main, _BB_DIR_BIN)
 #endif
 #ifdef BB_SLEEP