network-manager: add support for pppd

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index a4eeeaf462521e0696bb97448d3b9ac7773e2bd5..a6fbf0bdadd5c7ee80125e26d963be0c23063966 100644 (file)
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -26,6 +26,15 @@ config BR2_PACKAGE_NETWORK_MANAGER
 
          http://projects.gnome.org/NetworkManager/
 
+if BR2_PACKAGE_NETWORK_MANAGER
+
+config BR2_PACKAGE_NETWORK_MANAGER_PPPD
+       bool "pppd support"
+       select BR2_PACKAGE_PPPD
+       help
+         This option enables support for PPPD daemon
+endif
+
 comment "NetworkManager needs udev /dev management and a toolchain w/ IPv6, largefile, wchar, threads"
        depends on !BR2_avr32
        depends on BR2_USE_MMU

diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index cd8b5282f3015283f61e9ccd302ee247c48b9494..03057a62ca02c5791534c69e5e28ad3b66b0d062 100644 (file)
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -29,11 +29,17 @@ NETWORK_MANAGER_CONF_OPT = \
                --disable-gtk-doc \
                --localstatedir=/var \
                --with-crypto=gnutls \
-               --disable-ppp \
                --with-iptables=/usr/sbin/iptables \
                --disable-ifupdown \
                --disable-ifnet
 
+ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
+       NETWORK_MANAGER_DEPENDENCIES += pppd
+       NETWORK_MANAGER_CONF_OPT += --enable-ppp
+else
+       NETWORK_MANAGER_CONF_OPT += --disable-ppp
+endif
+
 ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
 NETWORK_MANAGER_CONF_OPT += --with-dhclient=/usr/sbin/dhclient
 endif