[PATCH] make: distcheck does not complain about missing vpn files

Jukka Rissanen jukka.rissanen at linux.intel.com
Mon Nov 26 03:04:42 PST 2012


The distcheck must not enable vpn providers if original
makefile is generated without vpn support.
So following command will work after this patch
     ./bootstrap && ./configure && make distcheck
---
 Makefile.am | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bd130c3..47ebddc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -343,13 +343,16 @@ pkgconfig_DATA = connman.pc
 DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
 				--disable-datafiles \
 				--enable-hh2serial-gps \
-				--enable-openconnect \
-				--enable-openvpn \
-				--enable-vpnc \
 				--enable-session-policy \
 				--enable-nmcompat \
 				--enable-polkit
 
+if VPN
+DISTCHECK_CONFIGURE_FLAGS += --enable-openconnect \
+				--enable-openvpn \
+				--enable-vpnc
+endif
+
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 MAINTAINERCLEANFILES = Makefile.in \
-- 
1.7.11.4




More information about the connman mailing list