From 087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3 Mon Sep 17 00:00:00 2001 From: Gennady Feldman Date: Fri, 26 Oct 2001 16:09:09 +0000 Subject: [PATCH] Fix up the configuration rules and update Libc5 piece for Syslogd. (copied code from logread.c) --- sysklogd/config.in | 9 +++++++-- sysklogd/syslogd.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sysklogd/config.in b/sysklogd/config.in index 8a8e42086..be8b16066 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 db6401c52..236f1190d 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 #include #include