From d8adaa279ef66cb6fdc1f9643f4908ea483e296a Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 15 Mar 2001 17:54:56 +0000 Subject: [PATCH] Update the olympus sections --- Config.h.Hurd | 106 +++++++++++++++++++++++++++++--------- debian/Config.h-deb | 112 +++++++++++++++++++++++++--------------- debian/Config.h-static | 113 ++++++++++++++++++++++++++--------------- debian/Config.h-udeb | 112 +++++++++++++++++++++++++--------------- 4 files changed, 292 insertions(+), 151 deletions(-) diff --git a/Config.h.Hurd b/Config.h.Hurd index 37806c12e..e75ca86f6 100644 --- 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 90368232f..649dd431f 100644 --- 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 9dc2215fd..c4ce444f3 100644 --- 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 2bd3ed2fa..93c6e9051 100644 --- 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 + -- 2.25.1