Release 1.10

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

diff --git a/configure.ac b/configure.ac
index 2a7b20b..764a453 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 1.6)
+AC_INIT(connman, 1.10)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AM_CONFIG_HEADER(config.h)
@@ -23,7 +23,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([])])
@@ -34,7 +34,7 @@ AC_PROG_LIBTOOL
 AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
                        [disable code optimization through compiler]), [
        if (test "${enableval}" = "no"); then
-               CFLAGS="$CFLAGS -O0"
+               CFLAGS="$CFLAGS -O0 -U_FORTIFY_SOURCE"
        fi
 ])
 
@@ -252,11 +252,11 @@ 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_ENABLE(session-policy-local,
+       AC_HELP_STRING([--enable-session-policy-local], [enable local file Session policy configuration support]),
+                       [enable_session_policy_local=${enableval}], [enable_session_policy_local="no"])
+AM_CONDITIONAL(SESSION_POLICY_LOCAL, test "${enable_session_policy_local}" != "no")
+AM_CONDITIONAL(SESSION_POLICY_LOCAL_BUILTIN, test "${enable_session_policy_local}" = "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]),
@@ -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}])
@@ -390,7 +395,7 @@ AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
 
 AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
                                [disable command line client]),
-                                       [disable_client=${enableval}])
+                                       [enable_client=${enableval}])
 AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
 
 if (test "${enable_wispr}" != "no"); then
@@ -421,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)