[network-manager-openvpn/lr/libnm] fixup! build: allow build without libnm-glib
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn/lr/libnm] fixup! build: allow build without libnm-glib
- Date: Wed, 19 Aug 2015 16:35:00 +0000 (UTC)
commit 717de800811b6aaf9cf4029c4d5c38e602e2d805
Author: Thomas Haller <thaller redhat com>
Date: Wed Aug 19 18:25:37 2015 +0200
fixup! build: allow build without libnm-glib
Makefile.am | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 78f23c8..fc7468d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,12 @@ nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-service.name
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
+if !WITH_LIBNM_GLIB
+ sed -e 's/^properties=[ ]PLUGINDIR[@].*/#\0/' $< >$@
+endif
sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
- $< >$@
+ -i $@
DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=yes \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]