diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-09-26 13:00:58 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-09-26 13:00:58 +0200 |
| commit | d5bc5a649cc521eb50d0898e5c4920d74ebf8be5 (patch) | |
| tree | f5c6505a0706795673c91fcafdc9b204fe011351 | |
| parent | d75d2929b76c13ed7bbd1e08df43107dd1be72e9 (diff) | |
| download | ptxdist-d5bc5a649cc521eb50d0898e5c4920d74ebf8be5.tar.gz ptxdist-d5bc5a649cc521eb50d0898e5c4920d74ebf8be5.tar.xz | |
[syslog-ng] cleanup dependencies
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/syslogng.in | 10 | ||||
| -rw-r--r-- | rules/syslogng.make | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/rules/syslogng.in b/rules/syslogng.in index 96654256e..f50fb0801 100644 --- a/rules/syslogng.in +++ b/rules/syslogng.in @@ -7,26 +7,26 @@ menuconfig SYSLOGNG select EVENTLOG select GLIB select LIBC_RT - select LIBNET - select TCPWRAPPER if SYSLOGNG__TCP_WRAPPER + select LIBNET if SYSLOGNG_SPOOF_SOURCE + select TCPWRAPPER if SYSLOGNG_TCP_WRAPPER help The next generation syslog daemon. if SYSLOGNG -config SYSLOGNG__IPV6 +config SYSLOGNG_IPV6 bool prompt "Support ipv6" help Enable ipv6 support, otherwise ipv4 is supported only -config SYSLOGNG__TCP_WRAPPER +config SYSLOGNG_TCP_WRAPPER bool prompt "tcpwrapper support" help Support /etc/hosts.deny and /etc/hosts.allow. -config SYSLOGNG__SPOOF_SOURCE +config SYSLOGNG_SPOOF_SOURCE bool prompt "spoof_source feature" help diff --git a/rules/syslogng.make b/rules/syslogng.make index 083c0159f..c0ca4f6ed 100644 --- a/rules/syslogng.make +++ b/rules/syslogng.make @@ -45,26 +45,27 @@ SYSLOGNG_ENV := $(CROSS_ENV) # SYSLOGNG_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --with-libnet=$(SYSROOT)/usr/bin \ --enable-dynamic-linking \ --disable-debug \ --disable-sun-streams \ --disable-sun-door -ifdef PTXCONF_SYSLOGNG__IPV6 +ifdef PTXCONF_SYSLOGNG_IPV6 SYSLOGNG_AUTOCONF += --enable-ipv6 else SYSLOGNG_AUTOCONF += --disable-ipv6 endif -ifdef PTXCONF_SYSLOGNG__TCP_WRAPPER +ifdef PTXCONF_SYSLOGNG_TCP_WRAPPER SYSLOGNG_AUTOCONF += --enable-tcp-wrapper else SYSLOGNG_AUTOCONF += --disable-tcp-wrapper endif -ifdef PTXCONF_SYSLOGNG__SPOOF_SOURCE -SYSLOGNG_AUTOCONF += --enable-spoof-source +ifdef PTXCONF_SYSLOGNG_SPOOF_SOURCE +SYSLOGNG_AUTOCONF += \ + --enable-spoof-source \ + --with-libnet=$(SYSROOT)/usr/bin else SYSLOGNG_AUTOCONF += --disable-spoof-source endif |