Fix up the configuration rules and update Libc5 piece for Syslogd. (copied code from...

diff --git a/sysklogd/config.in b/sysklogd/config.in
index 8a8e42086a1cfe151e5f99e32dfea3b80992ca0c..be8b16066cd900a2043695786395c2137d478da3 100644 (file)
--- 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 db6401c5202e581e235128438f04f176e7ba95bd..236f1190d12e9cb09f78747c2b916469be681311 100644 (file)
--- 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>