X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=220d62b8b1c2ed924c40d13cb14f5c71bbc3be1d;hb=5479dad2b3b5f342f51ca6e7ec8a5a501820bd55;hp=bdece8d778dcb7ef2cadfe394c4071d531278d27;hpb=581b2a808687d38a6181808b385a16c5fc2ed526;p=platform%2Fupstream%2Fconnman.git

diff --git a/configure.ac b/configure.ac
index bdece8d..220d62b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 1.37)
+AC_INIT(connman, 1.40)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -120,6 +120,8 @@ if (test "${enable_openconnect}" != "no"); then
 		OPENCONNECT="${path_openconnect}"
 		AC_SUBST(OPENCONNECT)
 	fi
+	PKG_CHECK_MODULES(LIBOPENCONNECT, openconnect >= 8, [],
+		AC_MSG_ERROR(openconnect >= 8 is required))
 fi
 AM_CONDITIONAL(OPENCONNECT, test "${enable_openconnect}" != "no")
 AM_CONDITIONAL(OPENCONNECT_BUILTIN, test "${enable_openconnect}" = "builtin")
@@ -298,8 +300,8 @@ PKG_CHECK_MODULES(LIBNL_GENL, libnl-genl-3.0, dummy=yes,
 AC_SUBST(LIBNL_GENL_CFLAGS)
 AC_SUBST(LIBNL_GENL_LIBS)
 
-PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd-daemon, dummy=yes,
-				AC_MSG_ERROR(libsystemd-daemon library is required))
+PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd, dummy=yes,
+				AC_MSG_ERROR(libsystemd library is required))
 AC_SUBST(LIBSYSTEMD_CFLAGS)
 AC_SUBST(LIBSYSTEMD_LIBS)
 
@@ -308,6 +310,11 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.4, dummy=yes,
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+PKG_CHECK_MODULES(DLOG, dlog, dummy=yes,
+				AC_MSG_ERROR(dlog is required))
+AC_SUBST(DLOG_CFLAGS)
+AC_SUBST(DLOG_LIBS)
+
 AC_ARG_WITH(dbusconfdir, AC_HELP_STRING([--with-dbusconfdir=PATH],
 	[path to D-Bus config directory]), [path_dbusconf=${withval}],
 		[path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"])
@@ -364,10 +371,20 @@ if (test "${firewall_type}" = "iptables"); then
 fi
 AM_CONDITIONAL(XTABLES, test "${found_iptables}" != "no")
 
+found_libmnl="no"
+if (test "${firewall_type}" = "nftables" -o \
+		"${enable_wireguard}" != "no"); then
+	PKG_CHECK_MODULES(LIBMNL, [libmnl >= 1.0.0], [found_libmnl="yes"],
+		AC_MSG_ERROR([libmnl >= 1.0.0 not found]))
+	AC_SUBST(LIBMNL_CFLAGS)
+	AC_SUBST(LIBMNL_LIBS)
+fi
+AM_CONDITIONAL(LIBMNL, test "${found_libmnl}" != "no")
+
 found_nftables="no"
 if (test "${firewall_type}" = "nftables"); then
-	PKG_CHECK_MODULES(NFTABLES, [libnftnl >= 1.0.4 libmnl >= 1.0.0], [found_nftables="yes"],
-		AC_MSG_ERROR([libnftnl >= 1.0.4 or libmnl >= 1.0.0 not found]))
+	PKG_CHECK_MODULES(NFTABLES, [libnftnl >= 1.0.4], [found_nftables="yes"],
+		AC_MSG_ERROR([libnftnl >= 1.0.4]))
 	AC_SUBST(NFTABLES_CFLAGS)
 	AC_SUBST(NFTABLES_LIBS)
 fi
@@ -410,6 +427,12 @@ AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--disable-ethernet],
 					[enable_ethernet=${enableval}])
 AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no")
 
+AC_ARG_ENABLE(wireguard, AC_HELP_STRING([--disable-wireguard],
+				[disable Wireguard support]),
+					[enable_wireguard=${enableval}])
+AM_CONDITIONAL(WIREGUARD, test "${enable_wireguard}" != "no")
+AM_CONDITIONAL(WIREGUARD_BUILTIN, test "${enable_wireguard}" = "builtin")
+
 AC_ARG_ENABLE(gadget, AC_HELP_STRING([--disable-gadget],
 				[disable USB Gadget support]),
 					[enable_gadget=${enableval}])
@@ -527,7 +550,8 @@ AM_CONDITIONAL(VPN, test "${enable_openconnect}" != "no" -o \
 			"${enable_ipsec}" != "no" -o \
 			"${enable_vpnc}" != "no" -o \
 			"${enable_l2tp}" != "no" -o \
-			"${enable_pptp}" != "no")
+			"${enable_pptp}" != "no" -o \
+			"${enable_wireguard}" != "no")
 
 AC_MSG_CHECKING(which DNS backend to use)
 AC_ARG_WITH(dns-backend, AC_HELP_STRING([--with-dns-backend=TYPE],