Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index b4af2b2..e932547 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -19,6 +19,7 @@ menuconfig NETWORKMANAGER
select UDEV if RUNTIME
select LIBGUDEV
select MODEMMANAGER if NETWORKMANAGER_WWAN
+ select PPP if NETWORKMANAGER_PPP
select WPA_SUPPLICANT if NETWORKMANAGER_WIRELESS && RUNTIME
select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS &&
RUNTIME
select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES && RUNTIME
@@ -64,6 +65,10 @@ config NETWORKMANAGER_WWAN
bool
prompt "enable WWAN support"
+config NETWORKMANAGER_PPP
+ bool
+ prompt "enable ppp support"
+
config NETWORKMANAGER_EXAMPLES
bool
prompt "install examples for Network Manager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 842c4e2..e77770d 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -47,7 +47,7 @@ NETWORKMANAGER_CONF_OPT := \
--disable-wimax \
--disable-polkit \
--disable-modify-system \
- --disable-ppp \
+ --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
--disable-bluez5-dun \
--disable-concheck \
--enable-more-warnings \
@@ -76,6 +76,10 @@ NETWORKMANAGER_CONF_OPT := \
--without-valgrind \
--without-tests
+ifdef PTXCONF_NETWORKMANAGER_PPP
+NETWORKMANAGER_CONF_OPT += \
+ --with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH)
+endif
ifdef PTXCONF_NETWORKMANAGER_WWAN
NETWORKMANAGER_LDFLAGS := \
@@ -180,6 +184,9 @@ ifdef PTXCONF_NETWORKMANAGER_WWAN
@$(call install_lib, networkmanager, 0, 0, 0644,
NetworkManager/libnm-device-plugin-wwan)
@$(call install_lib, networkmanager, 0, 0, 0644,
NetworkManager/libnm-wwan)
endif
+ifdef PTXCONF_NETWORKMANAGER_PPP
+ @$(call install_copy, networkmanager, 0, 0, 0644, -,
$(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so)
+endif
@$(call install_lib, networkmanager, 0, 0, 0644, libnm)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-util)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib)
--
ptxdist mailing list
ptxdist@pengutronix.de
