summaryrefslogtreecommitdiffstats
path: root/rules/networkmanager.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-02-26 15:31:57 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-03-04 17:01:36 +0100
commit848b7320c614343b624ab6e08fcebad91c171e22 (patch)
treed8ac76f8e526a4fe97c88d2af5764b8683644ac1 /rules/networkmanager.make
parentc56d6c9853d73c86da002b04c698a10b6ddc7534 (diff)
downloadptxdist-848b7320c614343b624ab6e08fcebad91c171e22.tar.gz
ptxdist-848b7320c614343b624ab6e08fcebad91c171e22.tar.xz
networkmanager: add option for WWAN support
The rpath is needed so that libnm-wwan.so is found by libnm-device-plugin-wwan.so. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/networkmanager.make')
-rw-r--r--rules/networkmanager.make12
1 files changed, 11 insertions, 1 deletions
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 677460e42..46efa8233 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -62,7 +62,7 @@ NETWORKMANAGER_CONF_OPT := \
--with-suspend-resume=systemd \
--with-crypto=gnutls \
--with-dbus-sys-dir=/etc/dbus-1/system.d \
- --without-modem-manager-1 \
+ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WWAN)-modem-manager-1 \
--with-dhclient=/sbin/dhclient \
--without-dhcpcd \
--without-resolvconf \
@@ -76,6 +76,12 @@ NETWORKMANAGER_CONF_OPT := \
--without-valgrind \
--without-tests
+
+ifdef PTXCONF_NETWORKMANAGER_WWAN
+NETWORKMANAGER_LDFLAGS := \
+ -Wl,-rpath,/usr/lib/NetworkManager
+endif
+
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
@@ -168,6 +174,10 @@ endif
ifdef PTXCONF_NETWORKMANAGER_WIRELESS
@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wifi)
endif
+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
@$(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)