Another update from Larry:

[oweals/busybox.git] / Config.h.Hurd

diff --git a/Config.h.Hurd b/Config.h.Hurd
index 37806c12ee50fe3e65cbdc3db41bba939353d3f3..87be05f638cb4340ef3fe9d6b595887fe94e28bd 100644 (file)
--- a/Config.h.Hurd
+++ b/Config.h.Hurd
@@ -14,11 +14,13 @@
 #define BB_AR
 #define BB_BASENAME
 #define BB_CAT
-#define BB_CHMOD_CHOWN_CHGRP
+#define BB_CHGRP
+#define BB_CHMOD
+#define BB_CHOWN
 #define BB_CHROOT
 //#define BB_CHVT      /* not needed */
 #define BB_CLEAR
-#define BB_CP_MV
+#define BB_CP
 #define BB_CUT
 #define BB_DATE
 #define BB_DC
@@ -72,6 +74,7 @@
 #define BB_MORE
 //#define BB_MOUNT     /* different implementation */
 #define BB_MT
+#define BB_MV
 #define BB_NSLOOKUP
 //#define BB_PING      /* doesnt compile, Hurd uses BSD style ip.h */
 //#define BB_POWEROFF  /* different implementation i assume */
@@ -144,9 +147,8 @@
 // at the same time...
 #define BB_FEATURE_USE_PROCFS
 //
-// This compiles out everything but the most 
-// trivial --help usage information (i.e. reduces binary size)
-//#define BB_FEATURE_TRIVIAL_HELP
+// show verbose usage messages
+#define BB_FEATURE_VERBOSE_USAGE
 //
 // Use termios to manipulate the screen ('more' is prettier with this on)
 #define BB_FEATURE_USE_TERMIOS
@@ -209,9 +211,6 @@
 // (i.e. in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
-// use -i (interactive) flag for rm
-//#define BB_FEATURE_RM_INTERACTIVE
-//
 // Enable support for creation of tar files.
 #define BB_FEATURE_TAR_CREATE
 //
@@ -273,51 +272,49 @@
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
-#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
-#define BB_MTAB
-#endif
-//
-#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH
-#define BB_CMDEDIT
+#if defined BB_SH
+       #if defined BB_FEATURE_COMMAND_EDITING 
+               #define BB_CMDEDIT
+       #else
+               #undef BB_FEATURE_COMMAND_EDITING
+               #undef BB_FEATURE_COMMAND_TAB_COMPLETION
+               #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
+               #define BB_FEATURE_SH_SIMPLE_PROMPT
+       #endif
+#else
+       #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+       #undef BB_FEATURE_SH_STANDALONE_SHELL
+       #undef BB_FEATURE_SH_SIMPLE_PROMPT
 #endif
 //
 #ifdef BB_KILLALL
-#ifndef BB_KILL
-#define BB_KILL
-#endif
+       #ifndef BB_KILL
+               #define BB_KILL
+       #endif
 #endif
 //
-#ifdef BB_FEATURE_LINUXRC
 #ifndef BB_INIT
-#define BB_INIT
-#endif
-#define BB_LINUXRC
-#endif
-//
-#ifdef BB_GZIP
-#ifndef BB_GUNZIP
-#define BB_GUNZIP
-#endif
+       #undef BB_FEATURE_LINUXRC
 #endif
 //
 #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
-#define BB_NFSMOUNT
-#endif
-//
-#if defined BB_FEATURE_SH_COMMAND_EDITING
-#ifndef BB_FEATURE_USE_TERMIOS
-#define BB_FEATURE_USE_TERMIOS
-#endif
+       #define BB_NFSMOUNT
 #endif
 //
 #if defined BB_FEATURE_AUTOWIDTH
-#ifndef BB_FEATURE_USE_TERMIOS
-#define BB_FEATURE_USE_TERMIOS
-#endif
+       #ifndef BB_FEATURE_USE_TERMIOS
+               #define BB_FEATURE_USE_TERMIOS
+       #endif
 #endif
 //
-#if defined BB_INSMOD
-#ifndef BB_FEATURE_INSMOD_OLD_KERNEL
-#define BB_FEATURE_INSMOD_NEW_KERNEL
+#if defined BB_INSMOD || defined BB_LSMOD
+       #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
+               #define BB_FEATURE_NEW_MODULE_INTERFACE
+       #endif
 #endif
+//
+#ifdef BB_SYSLOGD
+       #if defined BB_FEATURE_IPC_SYSLOG
+               #define BB_LOGREAD
+       #endif
 #endif