diff options
author | Gennady Feldman <gfeldman@gena01.com> | 2001-10-26 16:09:09 +0000 |
---|---|---|
committer | Gennady Feldman <gfeldman@gena01.com> | 2001-10-26 16:09:09 +0000 |
commit | 087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3 (patch) | |
tree | ea82edc01b31c57466a552d32418a3e0f94761e7 | |
parent | ee28362597b2846ded3d0f7a3d70cfc411b9314a (diff) | |
download | busybox-w32-087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3.tar.gz busybox-w32-087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3.tar.bz2 busybox-w32-087bc82bb0eabf8dedb8b35c85ea0294eaae2ce3.zip |
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 8a8e42086..be8b16066 100644 --- a/sysklogd/config.in +++ b/sysklogd/config.in | |||
@@ -8,9 +8,14 @@ comment 'System Logging Utilities' | |||
8 | 8 | ||
9 | bool 'klogd' CONFIG_KLOGD | 9 | bool 'klogd' CONFIG_KLOGD |
10 | bool 'logger' CONFIG_LOGGER | 10 | bool 'logger' CONFIG_LOGGER |
11 | bool 'logread' CONFIG_LOGREAD | ||
12 | bool 'syslogd' CONFIG_SYSLOGD | 11 | bool 'syslogd' CONFIG_SYSLOGD |
13 | 12 | if [ "$CONFIG_SYSLOGD" = "y" ] ; then | |
13 | bool ' Remote Log support ' CONFIG_FEATURE_REMOTE_LOG | ||
14 | bool ' Circular Buffer support ' CONFIG_FEATURE_IPC_SYSLOG | ||
15 | if [ "$CONFIG_FEATURE_IPC_SYSLOG" = "y" ] ; then | ||
16 | bool ' logread ' CONFIG_LOGREAD | ||
17 | fi | ||
18 | fi | ||
14 | 19 | ||
15 | endmenu | 20 | endmenu |
16 | 21 | ||
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; | |||
81 | /* circular buffer variables/structures */ | 81 | /* circular buffer variables/structures */ |
82 | #ifdef CONFIG_FEATURE_IPC_SYSLOG | 82 | #ifdef CONFIG_FEATURE_IPC_SYSLOG |
83 | 83 | ||
84 | #if __GNU_LIBRARY__ < 5 | ||
85 | #error Sorry. Looks like you are using libc5. | ||
86 | #error libc5 shm support isnt good enough. | ||
87 | #error Please disable CONFIG_FEATURE_IPC_SYSLOG | ||
88 | #endif | ||
89 | |||
84 | #include <sys/ipc.h> | 90 | #include <sys/ipc.h> |
85 | #include <sys/sem.h> | 91 | #include <sys/sem.h> |
86 | #include <sys/shm.h> | 92 | #include <sys/shm.h> |