session: Store user AllowedBearers configuration

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

diff --git a/configure.ac b/configure.ac
index bfeb85b..48f365a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 0.85)
+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],
@@ -252,6 +252,12 @@ AC_ARG_ENABLE(tist,
 AM_CONDITIONAL(TIST, test "${enable_tist}" != "no")
 AM_CONDITIONAL(TIST_BUILTIN, test "${enable_tist}" = "builtin")
 
+AC_ARG_ENABLE(session-policy,
+       AC_HELP_STRING([--enable-session-policy], [enable default Session policy configuration support]),
+                       [enable_session_policy=${enableval}], [enable_session_policy="no"])
+AM_CONDITIONAL(SESSION_POLICY, test "${enable_session_policy}" != "no")
+AM_CONDITIONAL(SESSION_POLICY_BUILTIN, test "${enable_session_policy}" = "builtin")
+
 AC_ARG_WITH(stats-max-file-size, AC_HELP_STRING([--with-stats-max-file-size=SIZE],
                        [Maximal size of a statistics round robin file]),
                        [stats_max_file_size=${withval}])
@@ -310,11 +316,6 @@ if (test -n "${path_systemdunit}"); then
 fi
 AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
 
-PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes,
-                               AC_MSG_ERROR(GnuTLS library is required))
-AC_SUBST(GNUTLS_CFLAGS)
-AC_SUBST(GNUTLS_LIBS)
-
 PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes,
                                AC_MSG_ERROR(Xtables library is required))
 AC_SUBST(XTABLES_CFLAGS)
@@ -342,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}])
@@ -367,21 +373,41 @@ AC_ARG_ENABLE(ofono, AC_HELP_STRING([--disable-ofono],
                                        [enable_ofono=${enableval}])
 AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
 
+AC_ARG_ENABLE(dundee, AC_HELP_STRING([--disable-dundee],
+                               [disable dundee support (Bluetooth DUN)]),
+                                       [enable_dundee=${enableval}])
+AM_CONDITIONAL(DUNDEE, test "${enable_dundee}" != "no")
+
 AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner],
                                [disable PACrunner support]),
                                        [enable_pacrunner=${enableval}])
 AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no")
 
-AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
-                               [disable command line client]),
-                                       [disable_client=${enableval}])
-AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
+AC_ARG_ENABLE(wispr, AC_HELP_STRING([--disable-wispr],
+                               [disable WISPr support]),
+                                       [enable_wispr=${enableval}])
+AM_CONDITIONAL(WISPR, test "${enable_wispr}" != "no")
 
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
                                [disable testing tools]),
                                        [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
 
+AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
+                               [disable command line client]),
+                                       [disable_client=${enableval}])
+AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
+
+if (test "${enable_wispr}" != "no"); then
+       PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes,
+                               AC_MSG_ERROR(GnuTLS library is required))
+else
+       GNUTLS_CFLAGS=""
+       GNUTLS_LIBS=""
+fi
+AC_SUBST(GNUTLS_CFLAGS)
+AC_SUBST(GNUTLS_LIBS)
+
 if (test "${enable_loopback}" != "no"); then
        AC_CHECK_HEADERS(sys/inotify.h, dummy=yes,
                        AC_MSG_ERROR(inotify header files are required))
@@ -400,5 +426,17 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
                                        [enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
+if (test "${enable_client}" != "no"); then
+       AC_CHECK_HEADERS(readline/readline.h, dummy=yes,
+               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)