Update the olympus sections

diff --git a/Config.h.Hurd b/Config.h.Hurd
index 37806c12ee50fe3e65cbdc3db41bba939353d3f3..e75ca86f65f772f17d6253789e9f91f1fce75e8a 100644 (file)
--- a/Config.h.Hurd
+++ b/Config.h.Hurd
@@ -273,51 +273,107 @@
 // 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_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_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
+       #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
+

diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 90368232f4d5acf7b47f9bc9b1b66b3d0660d4b6..649dd431f25ee6ff9730e482592b262fc736ffa1 100644 (file)
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -325,78 +325,106 @@
 // 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
+       #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
+               #define BB_MTAB
+       #endif
 #else
-#undef BB_MTAB
+       #undef 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
+               #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
 //
 #ifndef BB_INIT
-#undef BB_LINUXRC
-#undef BB_FEATURE_LINUXRC
+       #undef BB_LINUXRC
+       #undef BB_FEATURE_LINUXRC
 #endif
 //
 #ifdef BB_GZIP
-#ifndef BB_GUNZIP
-#define BB_GUNZIP
-#endif
+       #ifndef BB_GUNZIP
+               #define BB_GUNZIP
+       #endif
 #endif
 //
 #ifdef BB_DPKG
-#ifndef BB_DPKG_DEB
-#define BB_DPKG_DEB
-#endif
+       #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
+       #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
+       #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
+       #define BB_NFSMOUNT
 #endif
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
-#ifndef BB_FEATURE_USE_TERMIOS
-#define BB_FEATURE_USE_TERMIOS
-#endif
-#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
-#endif
+       #ifndef BB_FEATURE_USE_TERMIOS
+               #define BB_FEATURE_USE_TERMIOS
+       #endif
 #endif
 //
 #if defined BB_INSMOD || defined BB_LSMOD
-#ifndef BB_FEATURE_NEW_MODULE_INTERFACE
-#define BB_FEATURE_NEW_MODULE_INTERFACE
+       #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
+//
+#if defined BB_DOS2UNIX 
+       #define BB_UNIX2DOS
 #endif
+

diff --git a/debian/Config.h-static b/debian/Config.h-static
index 9dc2215fd5b669ffd17424e4ea3582f059a3d87f..c4ce444f3dc251889b0f14803310eb42d70610b5 100644 (file)
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -325,78 +325,107 @@
 // 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
+       #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
+               #define BB_MTAB
+       #endif
 #else
-#undef BB_MTAB
+       #undef 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
+               #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
 //
 #ifndef BB_INIT
-#undef BB_LINUXRC
-#undef BB_FEATURE_LINUXRC
+       #undef BB_LINUXRC
+       #undef BB_FEATURE_LINUXRC
 #endif
 //
 #ifdef BB_GZIP
-#ifndef BB_GUNZIP
-#define BB_GUNZIP
-#endif
+       #ifndef BB_GUNZIP
+               #define BB_GUNZIP
+       #endif
 #endif
 //
 #ifdef BB_DPKG
-#ifndef BB_DPKG_DEB
-#define BB_DPKG_DEB
-#endif
+       #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
+       #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
+       #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
+       #define BB_NFSMOUNT
 #endif
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
-#ifndef BB_FEATURE_USE_TERMIOS
-#define BB_FEATURE_USE_TERMIOS
-#endif
-#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
-#endif
+       #ifndef BB_FEATURE_USE_TERMIOS
+               #define BB_FEATURE_USE_TERMIOS
+       #endif
 #endif
 //
 #if defined BB_INSMOD || defined BB_LSMOD
-#ifndef BB_FEATURE_NEW_MODULE_INTERFACE
-#define BB_FEATURE_NEW_MODULE_INTERFACE
+       #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
+//
+#if defined BB_DOS2UNIX 
+       #define BB_UNIX2DOS
 #endif
+
+

diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index 2bd3ed2faa07ccb5cc6ed1c0051a483860b80bdf..93c6e90516de1e62a3b8d22271d2bb6b1374a8ab 100644 (file)
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -325,78 +325,106 @@
 // 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
+       #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
+               #define BB_MTAB
+       #endif
 #else
-#undef BB_MTAB
+       #undef 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
+               #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
 //
 #ifndef BB_INIT
-#undef BB_LINUXRC
-#undef BB_FEATURE_LINUXRC
+       #undef BB_LINUXRC
+       #undef BB_FEATURE_LINUXRC
 #endif
 //
 #ifdef BB_GZIP
-#ifndef BB_GUNZIP
-#define BB_GUNZIP
-#endif
+       #ifndef BB_GUNZIP
+               #define BB_GUNZIP
+       #endif
 #endif
 //
 #ifdef BB_DPKG
-#ifndef BB_DPKG_DEB
-#define BB_DPKG_DEB
-#endif
+       #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
+       #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
+       #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
+       #define BB_NFSMOUNT
 #endif
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
-#ifndef BB_FEATURE_USE_TERMIOS
-#define BB_FEATURE_USE_TERMIOS
-#endif
-#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
-#endif
+       #ifndef BB_FEATURE_USE_TERMIOS
+               #define BB_FEATURE_USE_TERMIOS
+       #endif
 #endif
 //
 #if defined BB_INSMOD || defined BB_LSMOD
-#ifndef BB_FEATURE_NEW_MODULE_INTERFACE
-#define BB_FEATURE_NEW_MODULE_INTERFACE
+       #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
+//
+#if defined BB_DOS2UNIX 
+       #define BB_UNIX2DOS
 #endif
+