dhcp: Cancel old renewal timeout prior to adding a new one
[framework/connectivity/connman.git] / configure.ac
index 4620a8c..fa91a9c 100644 (file)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 0.62)
+AC_INIT(connman, 0.74)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -95,23 +95,6 @@ AC_ARG_ENABLE(ofono,
 AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
 AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin")
 
-AC_ARG_WITH(dhclient, AC_HELP_STRING([--with-dhclient=PROGRAM],
-       [specify location of dhclient binary]), [path_dhclient=${withval}])
-
-AC_ARG_ENABLE(dhclient,
-       AC_HELP_STRING([--enable-dhclient], [enable dhclient support]),
-                       [enable_dhclient=${enableval}], [enable_dhclient="no"])
-if (test "${enable_dhclient}" != "no"); then
-       if (test -z "${path_dhclient}"); then
-               AC_PATH_PROG(DHCLIENT, [dhclient], [], $PATH:/sbin:/usr/sbin)
-       else
-               DHCLIENT="${path_dhclient}"
-               AC_SUBST(DHCLIENT)
-       fi
-fi
-AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" != "no")
-AM_CONDITIONAL(DHCLIENT_BUILTIN, test "${enable_dhclient}" = "builtin")
-
 AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM],
         [specify location of openconnect binary]), [path_openconnect=${withval}])
 
@@ -135,6 +118,40 @@ AC_ARG_ENABLE(portal,
 AM_CONDITIONAL(PORTAL, test "${enable_portal}" != "no")
 AM_CONDITIONAL(PORTAL_BUILTIN, test "${enable_portal}" = "builtin")
 
+AC_ARG_WITH(openvpn, AC_HELP_STRING([--with-openvpn=PROGRAM],
+        [specify location of openvpn binary]), [path_openvpn=${withval}])
+
+AC_ARG_ENABLE(openvpn,
+       AC_HELP_STRING([--enable-openvpn], [enable openvpn support]),
+                       [enable_openvpn=${enableval}], [enable_openvpn="no"])
+if (test "${enable_openvpn}" != "no"); then
+       if (test -z "${path_openvpn}"); then
+               AC_PATH_PROG(OPENVPN, [openvpn], [], $PATH:/sbin:/usr/sbin)
+       else
+               OPENVPN="${path_openvpn}"
+               AC_SUBST(OPENVPN)
+       fi
+fi
+AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no")
+AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin")
+
+AC_ARG_WITH(vpnc, AC_HELP_STRING([--with-vpnc=PROGRAM],
+       [specify location of vpnc binary]), [path_vpnc=${withval}])
+
+AC_ARG_ENABLE(vpnc,
+       AC_HELP_STRING([--enable-vpnc], [enable vpnc support]),
+               [enable_vpnc=${enableval}], [enable_vpnc="no"])
+if (test "${enable_vpnc}" != "no"); then
+       if (test -z "${path_vpnc}"); then
+               AC_PATH_PROG(VPNC, [vpnc], [], $PATH:/sbin:/usr/sbin)
+       else
+               VPNC="${path_vpnc}"
+               AC_SUBST(VPNC)
+       fi
+fi
+AM_CONDITIONAL(VPNC, test "${enable_vpnc}" != "no")
+AM_CONDITIONAL(VPNC_BUILTIN, test "${enable_vpnc}" = "builtin")
+
 AC_ARG_ENABLE(loopback,
        AC_HELP_STRING([--enable-loopback], [enable loopback support]),
                        [enable_loopback=${enableval}], [enable_loopback="no"])
@@ -148,13 +165,6 @@ fi
 AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no")
 AM_CONDITIONAL(LOOPBACK_BUILTIN, test "${enable_loopback}" = "builtin")
 
-AC_ARG_ENABLE(dnsproxy,
-       AC_HELP_STRING([--enable-dnsproxy], [enable DNS proxy support]),
-                       [enable_dnsproxy=${enableval}], [enable_dnsproxy="no"])
-
-AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" != "no")
-AM_CONDITIONAL(DNSPROXY_BUILTIN, test "${enable_dnsproxy}" = "builtin")
-
 AC_ARG_ENABLE(pacrunner,
        AC_HELP_STRING([--enable-pacrunner], [enable PAC runner support]),
                        [enable_pacrunner=${enableval}], [enable_pacrunner="no"])
@@ -246,7 +256,7 @@ AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
                [enable Intel OSPM support]), [enable_iospm=${enableval}])
 AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
 
-AC_ARG_WITH(ntpd, AC_HELP_STRING([--with-=PROGRAM],
+AC_ARG_WITH(ntpd, AC_HELP_STRING([--with-ntpd=PROGRAM],
        [specify ntpd binary location]), [path_ntpd=${withval}])
 
 AC_ARG_ENABLE(ntpd,
@@ -264,19 +274,31 @@ fi
 AM_CONDITIONAL(NTPD, test "${enable_ntpd}" != "no")
 AM_CONDITIONAL(NTPD_BUILTIN, test "${enable_ntpd}" = "builtin")
 
+AC_ARG_ENABLE(nmcompat,
+       AC_HELP_STRING([--enable-nmcompat], [enable nmcompat support]),
+                       [enable_nmcompat=${enableval}], [enable_nmcompat="no"])
+AM_CONDITIONAL(NMCOMPAT, test "${enable_nmcompat}" != "no")
+AM_CONDITIONAL(NMCOMPAT_BUILTIN, test "${enable_nmcompat}" = "builtin")
+
+AC_ARG_ENABLE(tist,
+       AC_HELP_STRING([--enable-tist], [enable TI Shared Transport support]),
+                       [enable_tist=${enableval}], [enable_tist="no"])
+AM_CONDITIONAL(TIST, test "${enable_tist}" != "no")
+AM_CONDITIONAL(TIST_BUILTIN, test "${enable_tist}" = "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}])
+                       [Maximal size of a statistics round robin file]),
+                       [stats_max_file_size=${withval}])
 
 if (test -z "${stats_max_file_size}"); then
-   # default size is 512 kByte
-   stats_max_file_size="512 * 8 * 128"
+   # default size is 16 kByte
+   stats_max_file_size="16 * 8 * 128"
 fi
 
 AC_DEFINE_UNQUOTED([STATS_MAX_FILE_SIZE], (${stats_max_file_size}), [Maximal size of a statistics round robin file])
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
-                               AC_MSG_ERROR(GLib >= 2.16 is required))
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22, dummy=yes,
+                               AC_MSG_ERROR(GLib >= 2.22 is required))
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -290,9 +312,19 @@ fi
 
 PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
                                AC_MSG_ERROR(D-Bus >= 1.0 is required))
+saved_CFLAGS="$CFLAGS"
+saved_LIBS="$LIBS"
+CFLAGS="$CFLAGS $DBUS_CFLAGS"
+LIBS="$LIBS $DBUS_LIBS"
 AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes,
        AC_DEFINE(NEED_DBUS_WATCH_GET_UNIX_FD, 1,
                [Define to 1 if you need the dbus_watch_get_unix_fd() function.]))
+AC_CHECK_LIB(dbus-1, dbus_connection_can_send_type, dummy=yes,
+       AC_DEFINE(NEED_DBUS_CONNECTION_CAN_SEND_TYPE, 1,
+               [Define to 1 if you need the dbus_connection_can_send_type() function.]
+))
+CFLAGS="$saved_CFLAGS"
+LIBS="$saved_LIBS"
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
@@ -306,6 +338,30 @@ else
 fi
 AC_SUBST(DBUS_CONFDIR)
 
+AC_ARG_WITH(dbusdatadir, AC_HELP_STRING([--with-dbusdatadir=PATH],
+       [path to D-Bus data directory]), [path_dbusdata=${withval}],
+               [path_dbusdata="`$PKG_CONFIG --variable=datadir dbus-1`"])
+if (test -z "${path_dbusdata}"); then
+       DBUS_DATADIR="${datadir}/dbus-1/system-services"
+else
+       DBUS_DATADIR="${path_dbusdata}/dbus-1/system-services"
+fi
+AC_SUBST(DBUS_DATADIR)
+
+AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
+       [path to systemd service directory]), [path_systemdunit=${withval}],
+               [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
+if (test -n "${path_systemdunit}"); then
+       SYSTEMD_UNITDIR="${path_systemdunit}"
+       AC_SUBST(SYSTEMD_UNITDIR)
+fi
+AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
+
+PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes,
+                               AC_MSG_ERROR(Xtables library is required))
+AC_SUBST(XTABLES_CFLAGS)
+AC_SUBST(XTABLES_LIBS)
+
 AC_ARG_ENABLE(polkit,
        AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]),
                        [enable_polkit=${enableval}], [enable_polkit="no"])
@@ -327,15 +383,18 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes")
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
                [enable testing tools]), [enable_tools=${enableval}])
 if (test "${enable_tools}" = "yes"); then
-       PKG_CHECK_MODULES(IPTC, libiptc, dummy=yes,
-                               AC_MSG_ERROR(iptables library is required))
-       AC_SUBST(IPTC_CFLAGS)
-       AC_SUBST(IPTC_LIBS)
-
        PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes,
                                AC_MSG_ERROR(Netlink library is required))
        AC_SUBST(NETLINK_CFLAGS)
        AC_SUBST(NETLINK_LIBS)
+
+       PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes,
+                               AC_MSG_ERROR(GnuTLS library is required))
+       AC_SUBST(GNUTLS_CFLAGS)
+       AC_SUBST(GNUTLS_LIBS)
+
+       AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,
+               AC_MSG_ERROR(User-space algorithm header files are required))
 fi
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
 
@@ -357,24 +416,6 @@ if (test "${enable_capng}" = "yes"); then
        AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
 fi
 
-AC_ARG_ENABLE(udev, AC_HELP_STRING([--disable-udev],
-                       [don't use udev support even if available]),
-                                               [enable_udev=${enableval}])
-if (test "${enable_udev}" != "no"); then
-       PKG_CHECK_MODULES(UDEV, libudev >= 143, [enable_udev="yes"],
-                               AC_MSG_ERROR(libudev >= 143 is required))
-       UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`"
-       if (test -z "${UDEV_DATADIR}"); then
-               UDEV_DATADIR="${sysconfdir}/udev/rules.d"
-       else
-               UDEV_DATADIR="${UDEV_DATADIR}/rules.d"
-       fi
-       AC_SUBST(UDEV_DATADIR)
-fi
-AC_SUBST(UDEV_CFLAGS)
-AC_SUBST(UDEV_LIBS)
-AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
-
 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
                        [don't install configuration and data files]),
                                        [enable_datafiles=${enableval}])