Another update from Larry:

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

diff --git a/Config.h.Hurd b/Config.h.Hurd
index 369e376cdc6d602229a54cae69553a05ef37a929..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 */
@@ -208,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
 //
@@ -272,20 +272,9 @@
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
-#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-       #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
-               #define BB_MTAB
-       #endif
-#else
-       #undef BB_MTAB
-#endif 
-//
 #if defined BB_SH
        #if defined BB_FEATURE_COMMAND_EDITING 
                #define BB_CMDEDIT
-               #ifndef BB_FEATURE_USE_TERMIOS
-                       #define BB_FEATURE_USE_TERMIOS
-               #endif
        #else
                #undef BB_FEATURE_COMMAND_EDITING
                #undef BB_FEATURE_COMMAND_TAB_COMPLETION
@@ -293,7 +282,6 @@
                #define BB_FEATURE_SH_SIMPLE_PROMPT
        #endif
 #else
-       #undef BB_FEATURE_COMMAND_EDITING
        #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
        #undef BB_FEATURE_SH_STANDALONE_SHELL
        #undef BB_FEATURE_SH_SIMPLE_PROMPT
@@ -309,50 +297,10 @@
        #undef BB_FEATURE_LINUXRC
 #endif
 //
-#ifdef BB_GZIP
-       #ifndef BB_GUNZIP
-               #define BB_GUNZIP
-       #endif
-#endif
-//
-#ifdef BB_DPKG
-       #ifndef BB_DPKG_DEB
-               #define BB_DPKG_DEB
-       #endif
-#endif
-//
-#ifdef BB_DPKG_DEB
-       #ifndef BB_AR
-               #define BB_AR
-       #endif
-       #ifndef BB_TAR
-               #define BB_TAR
-       #endif 
-       #ifndef BB_FEATURE_TAR_GZIP
-               #define BB_FEATURE_TAR_GZIP
-       #endif
-#endif
-//
-#ifdef BB_TAR
-       #ifdef BB_FEATURE_TAR_GZIP
-               #ifndef BB_GUNZIP
-                       #define BB_GUNZIP
-               #endif
-       #endif
-#endif
-//
 #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
        #define BB_NFSMOUNT
 #endif
 //
-#if defined BB_IFCONFIG
-       #ifdef BB_FEATURE_IFCONFIG_STATUS
-               #define BB_INTERFACE
-       #endif
-#else
-       #undef BB_INTERFACE
-#endif 
-//
 #if defined BB_FEATURE_AUTOWIDTH
        #ifndef BB_FEATURE_USE_TERMIOS
                #define BB_FEATURE_USE_TERMIOS
@@ -370,8 +318,3 @@
                #define BB_LOGREAD
        #endif
 #endif
-//
-#if defined BB_DOS2UNIX 
-       #define BB_UNIX2DOS
-#endif
-