Update applet define from BB_CP_MV to BB_CP and BB_MV.

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

diff --git a/Config.h.Hurd b/Config.h.Hurd
index 60a5c6e2131ca9f72dafbcdf7f4188fc926d6e35..3736b5789704572eabfc87515cae5593f768700f 100644 (file)
--- a/Config.h.Hurd
+++ b/Config.h.Hurd
@@ -18,7 +18,7 @@
 #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 +72,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 */
@@ -126,14 +127,13 @@
 //
 //
 //
-// Turn this on to use Erik's very cool devps, devmtab, etc kernel drivers,
+// Turn this on to use Erik's very cool devps and devmtab kernel drivers,
 // thereby eliminating the need for the /proc filesystem and thereby saving
 // lots and lots memory for more important things.  You can not use this and
 // USE_PROCFS at the same time...  NOTE:  If you enable this feature, you
 // _must_ have patched the kernel to include the devps patch that is included
 // in the busybox/kernel-patches directory.  You will also need to create some
 // device special files in /dev on your embedded system:
-//        mknod /dev/modules c 10 23
 //        mknod /dev/mtab c 10 22
 //        mknod /dev/ps c 10 21
 // I emailed Linus and this patch will not be going into the stock kernel.
@@ -145,9 +145,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
@@ -190,9 +189,6 @@
 //Make sure nothing is printed to the console on boot
 #define BB_FEATURE_EXTRA_QUIET
 //
-//Should syslogd also provide klogd support?
-#define BB_FEATURE_KLOGD
-//
 // enable syslogd -R remotehost
 #define BB_FEATURE_REMOTE_LOG
 //
@@ -213,15 +209,15 @@
 // (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
 //
 // Enable support for "--exclude" for excluding files
 #define BB_FEATURE_TAR_EXCLUDE
 //
-// Enable support for s///p pattern matching
-#define BB_FEATURE_SED_PATTERN_SPACE
-//
 //// Enable reverse sort
 #define BB_FEATURE_SORT_REVERSE
 //
@@ -277,51 +273,98 @@
 // 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_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
+               #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
+               #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
 #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
+       #undef BB_FEATURE_LINUXRC
 #endif
 //
 #ifdef BB_GZIP
-#ifndef BB_GUNZIP
-#define BB_GUNZIP
+       #ifndef BB_GUNZIP
+               #define BB_GUNZIP
+       #endif
 #endif
+//
+#ifdef BB_DPKG
+       #ifndef BB_DPKG_DEB
+               #define BB_DPKG_DEB
+       #endif
 #endif
 //
-#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
-#define BB_NFSMOUNT
+#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
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
-#ifndef BB_FEATURE_USE_TERMIOS
-#define BB_FEATURE_USE_TERMIOS
+#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_FEATURE_AUTOWIDTH
-#ifndef BB_FEATURE_USE_TERMIOS
-#define BB_FEATURE_USE_TERMIOS
+       #ifndef BB_FEATURE_USE_TERMIOS
+               #define BB_FEATURE_USE_TERMIOS
+       #endif
 #endif
+//
+#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
 //
-#if defined BB_INSMOD
-#ifndef BB_FEATURE_INSMOD_OLD_KERNEL
-#define BB_FEATURE_INSMOD_NEW_KERNEL
+#ifdef BB_SYSLOGD
+       #if defined BB_FEATURE_IPC_SYSLOG
+               #define BB_LOGREAD
+       #endif
 #endif
+//
+#if defined BB_DOS2UNIX 
+       #define BB_UNIX2DOS
 #endif
+