diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-13 19:06:09 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-16 10:56:38 +0200 |
| commit | d2ff4e524aeba2b07358612ecc3d3013649009a5 (patch) | |
| tree | dee2f11a9f3501fa1d829dfd55b3dd52998f6767 | |
| parent | 899c40f545a8bda1165ebb03c6f68d13084a0b9a (diff) | |
| download | ptxdist-d2ff4e524aeba2b07358612ecc3d3013649009a5.tar.gz ptxdist-d2ff4e524aeba2b07358612ecc3d3013649009a5.tar.xz | |
[ppp] use global IPv6 option
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/ppp.in | 7 | ||||
| -rw-r--r-- | rules/ppp.make | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/rules/ppp.in b/rules/ppp.in index 827d5003d..9842233d3 100644 --- a/rules/ppp.in +++ b/rules/ppp.in @@ -8,7 +8,6 @@ menuconfig PPP select LIBC_RESOLV if PPP_PLUGINS select LIBC_CRYPT if PPP_NEEDS_CRYPT select LIBPCAP if PPP_FILTER - select LIBPCAP_IPV6 if PPP_FILTER && PPP_IPV6 select OPENSSL if PPP_SRP help Point-to-Point Protocol (PPP) - daemon @@ -32,12 +31,6 @@ config PPP_SUID Makes the pppd binary SUID for ruMakes the pppd binary SUID for Makes the pppd binary SUID for running as a server. -config PPP_IPV6 - bool - prompt "enable ipv6 support" - help - Enable IPV6 support - config PPP_IPX bool prompt "support IPX protocol" diff --git a/rules/ppp.make b/rules/ppp.make index 046175f88..f167d9b1d 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -58,7 +58,7 @@ $(STATEDIR)/ppp.prepare: @cd $(PPP_DIR) && $(PPP_PATH) $(PPP_CONF_ENV) \ ./configure --prefix=/usr --sysconfdir=/etc -ifdef PTXCONF_PPP_IPV6 +ifdef PTXCONF_GLOBAL_IPV6 @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) else @$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) |