iptables: Finalize target extensions setup

[framework/connectivity/connman.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 06ac210..280e587 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 0.74)
+AC_INIT(connman, 0.77)
 
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -104,6 +104,9 @@ AC_ARG_ENABLE(openconnect,
 if (test "${enable_openconnect}" != "no"); then
        if (test -z "${path_openconnect}"); then
                AC_PATH_PROG(OPENCONNECT, [openconnect], [], $PATH:/sbin:/usr/sbin)
+               if (test -z "${OPENCONNECT}"); then
+                       AC_MSG_ERROR(openconnect binary not found)
+               fi
        else
                OPENCONNECT="${path_openconnect}"
                AC_SUBST(OPENCONNECT)
@@ -112,12 +115,6 @@ fi
 AM_CONDITIONAL(OPENCONNECT, test "${enable_openconnect}" != "no")
 AM_CONDITIONAL(OPENCONNECT_BUILTIN, test "${enable_openconnect}" = "builtin")
 
-AC_ARG_ENABLE(portal,
-       AC_HELP_STRING([--enable-portal], [enable portal detection support]),
-                       [enable_portal=${enableval}], [enable_portal="no"])
-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}])
 
@@ -127,6 +124,9 @@ AC_ARG_ENABLE(openvpn,
 if (test "${enable_openvpn}" != "no"); then
        if (test -z "${path_openvpn}"); then
                AC_PATH_PROG(OPENVPN, [openvpn], [], $PATH:/sbin:/usr/sbin)
+               if (test -z "${OPENVPN}"); then
+                       AC_MSG_ERROR(openvpn binary not found)
+               fi
        else
                OPENVPN="${path_openvpn}"
                AC_SUBST(OPENVPN)
@@ -144,6 +144,9 @@ AC_ARG_ENABLE(vpnc,
 if (test "${enable_vpnc}" != "no"); then
        if (test -z "${path_vpnc}"); then
                AC_PATH_PROG(VPNC, [vpnc], [], $PATH:/sbin:/usr/sbin)
+               if (test -z "${VPNC}"); then
+                       AC_MSG_ERROR(vpnc binary not found)
+               fi
        else
                VPNC="${path_vpnc}"
                AC_SUBST(VPNC)
@@ -191,6 +194,9 @@ AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [
                AC_MSG_ERROR(resolver library support is required))
 ])
 
+AC_CHECK_FUNC(signalfd, dummy=yes,
+                       AC_MSG_ERROR(signalfd support is required))
+
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
                        AC_MSG_ERROR(dynamic linking loader is required))
 
@@ -383,15 +389,13 @@ 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(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")