diff options
| author | Gennady Feldman | 2001-10-26 16:09:09 +0000 |
|---|---|---|
| committer | Gennady Feldman | 2001-10-26 16:09:09 +0000 |
| commit | 087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3 (patch) | |
| tree | ea82edc01b31c57466a552d32418a3e0f94761e7 | |
| parent | ee28362597b2846ded3d0f7a3d70cfc411b9314a (diff) | |
| download | busybox-087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3.zip busybox-087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3.tar.gz | |
Fix up the configuration rules and update Libc5 piece for Syslogd. (copied code from logread.c)
| -rw-r--r-- | sysklogd/config.in | 9 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sysklogd/config.in b/sysklogd/config.in index 8a8e420..be8b160 100644 --- a/sysklogd/config.in +++ b/sysklogd/config.in @@ -8,9 +8,14 @@ comment 'System Logging Utilities' bool 'klogd' CONFIG_KLOGD bool 'logger' CONFIG_LOGGER -bool 'logread' CONFIG_LOGREAD bool 'syslogd' CONFIG_SYSLOGD - +if [ "$CONFIG_SYSLOGD" = "y" ] ; then + bool ' Remote Log support ' CONFIG_FEATURE_REMOTE_LOG + bool ' Circular Buffer support ' CONFIG_FEATURE_IPC_SYSLOG + if [ "$CONFIG_FEATURE_IPC_SYSLOG" = "y" ] ; then + bool ' logread ' CONFIG_LOGREAD + fi +fi endmenu diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index db6401c..236f119 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -81,6 +81,12 @@ static int local_logging = FALSE; /* circular buffer variables/structures */ #ifdef CONFIG_FEATURE_IPC_SYSLOG +#if __GNU_LIBRARY__ < 5 +#error Sorry. Looks like you are using libc5. +#error libc5 shm support isnt good enough. +#error Please disable CONFIG_FEATURE_IPC_SYSLOG +#endif + #include <sys/ipc.h> #include <sys/sem.h> #include <sys/shm.h> |