session: Store user AllowedBearers configuration

[platform/upstream/connman.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dd9dfa4..48f365a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 1.7)
+AC_INIT(connman, 1.9)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AM_CONFIG_HEADER(config.h)
@@ -12,8 +12,6 @@ AC_PREFIX_DEFAULT(/usr/local)
 
 PKG_PROG_PKG_CONFIG
 
-COMPILER_FLAGS
-
 AC_SUBST(abs_top_srcdir)
 AC_SUBST(abs_top_builddir)
 
@@ -23,7 +21,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CC_PIE
 AC_PROG_INSTALL
-AM_PROG_MKDIR_P
+AC_PROG_MKDIR_P
 
 m4_define([_LT_AC_TAGCONFIG], [])
 m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
@@ -38,6 +36,8 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
        fi
 ])
 
+COMPILER_FLAGS
+
 GTK_DOC_CHECK
 
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
@@ -343,6 +343,11 @@ if (test "${enable_polkit}" != "no"); then
 fi
 AM_CONDITIONAL(POLKIT, test "${enable_polkit}" != "no")
 
+AC_ARG_ENABLE(selinux, AC_HELP_STRING([--enable-selinux],
+                               [enable selinux support]),
+                       [enable_selinux=${enableval}], [enable_selinux="no"])
+AM_CONDITIONAL(SELINUX, test "${enable_selinux}" != "no")
+
 AC_ARG_ENABLE(loopback, AC_HELP_STRING([--disable-loopback],
                                [disable loopback support]),
                                        [enable_loopback=${enableval}])
@@ -426,5 +431,12 @@ if (test "${enable_client}" != "no"); then
                AC_MSG_ERROR(readline header files are required))
 fi
 
+AM_CONDITIONAL(VPN, test "${enable_openconnect}" != "no" -o \
+                       "${enable_openvpn}" != "no" -o \
+                       "${enable_vpnc}" != "no" -o \
+                       "${enable_l2tp}" != "no" -o \
+                       "${enable_pptp}" != "no")
+
 AC_OUTPUT(Makefile include/version.h src/connman.service
-                               scripts/connman doc/version.xml connman.pc)
+               vpn/connman-vpn.service vpn/net.connman.vpn.service
+               scripts/connman doc/version.xml connman.pc)