Tito is using broken kernel headers that pollute the namespace with every

CONFIG_ symbol in the kernel, and this clashes with busybox's CONFIG_TR
and CONFIG_WATCHDOG, causing applets.h to barf if they're not switched
on (since the broken headers don't affect kconfig or the makefiles).

Since such broken kernel headers are common enough to crop up every few
months, a simple work around is to move TR and WATCHDOG from CONFIG_
to ENABLE_ early.


git-svn-id: svn://busybox.net/trunk/busybox@12707 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 2 insertions, 2 deletions

diff --git a/include/applets.h b/include/applets.h
index ec3a892d0..79d18207e 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -673,7 +673,7 @@
 #ifdef CONFIG_TOUCH
         APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_TR
+#if ENABLE_TR
         APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_TRACEROUTE
@@ -736,7 +736,7 @@
 #ifdef CONFIG_WATCH
         APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_WATCHDOG
+#if ENABLE_WATCHDOG
         APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_WC