unit: Test ippool collision differently

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

diff --git a/configure.ac b/configure.ac
index e0cac94..ebc8170 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 1.9)
+AC_INIT(connman, 1.15)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -184,64 +184,6 @@ AC_CHECK_FUNC(signalfd, dummy=yes,
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
                        AC_MSG_ERROR(dynamic linking loader is required))
 
-AC_ARG_WITH(iwmxsdk, AC_HELP_STRING([--with-iwmxsdk=PATH],
-                                               [path to Intel WiMAX SDK]),
-                               [pkgconfig_iwmxsdk=${withval}/lib/pkgconfig])
-
-AC_ARG_ENABLE(iwmx, AC_HELP_STRING([--enable-iwmx],
-               [enable Intel WiMAX support]), [enable_iwmx=${enableval}])
-if (test "${enable_iwmx}" = "yes"); then
-       enable_threads="yes"
-       export PKG_CONFIG_PATH="${pkgconfig_iwmxsdk}"
-       PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, dummy=yes,
-                               AC_MSG_ERROR(Intel WiMAX SDK is required))
-       PKG_CONFIG_PATH=""
-       AC_SUBST(IWMXSDK_CFLAGS)
-       AC_SUBST(IWMXSDK_LIBS)
-
-        # Fix API compat breakage from 1.4 to 1.5...
-        CPPFLAGS_save=$CPPFLAGS
-        CPPFLAGS="$IWMXSDK_CFLAGS $CPPFLAGS"
-        AH_TEMPLATE([HAVE_IWMXSDK_STATUS_IDLE],
-                    [WIMAX_API_DEVICE_STATUS_Connection_Idle is present])
-        AC_CHECK_DECL(WIMAX_API_DEVICE_STATUS_Connection_Idle,
-                      [AC_DEFINE([HAVE_IWMXSDK_STATUS_IDLE], [1], [])],
-                      [],
-                      [[#include <WiMaxType.h>]])
-
-        AH_TEMPLATE([HAVE_WIMAX_API_DEVICE_ID],
-                    [WIMAX_API_DEVICE_ID is present])
-        AC_CHECK_TYPE(WIMAX_API_DEVICE_ID,
-                      [AC_DEFINE([HAVE_WIMAX_API_DEVICE_ID], [1], [])],
-                      [],
-                      [[#include <WiMaxType.h>]])
-
-        AH_TEMPLATE([HAVE_WIMAX_API_HW_DEVICE_ID],
-                    [WIMAX_API_HW_DEVICE_ID is present])
-        AC_CHECK_TYPE(WIMAX_API_HW_DEVICE_ID,
-                      [AC_DEFINE([HAVE_WIMAX_API_HW_DEVICE_ID], [1], [])],
-                      [],
-                      [[#include <WiMaxType.h>]])
-
-        AH_TEMPLATE([HAVE_WIMAX_API_NSP_INFO_EX],
-                    [WIMAX_API_NSP_INFO_EX is present])
-        AC_CHECK_TYPE(WIMAX_API_NSP_INFO_EX,
-                      [AC_DEFINE([HAVE_WIMAX_API_NSP_INFO_EX], [1], [])],
-                      [],
-                      [[#include <WiMaxType.h>] 
-                       [#include <WiMaxTypesEx.h>]])
-
-        AH_TEMPLATE([HAVE_WIMAX_API_CONNECTED_NSP_INFO],
-                    [WIMAX_API_CONNECTED_NSP_INFO is present])
-        AC_CHECK_TYPE(WIMAX_API_CONNECTED_NSP_INFO,
-                      [AC_DEFINE([HAVE_WIMAX_API_CONNECTED_NSP_INFO], [1], [])],
-                      [],
-                      [[#include <WiMaxType.h>]])
-
-        CPPFLAGS=$CPPFLAGS_save
-fi
-AM_CONDITIONAL(IWMX, test "${enable_iwmx}" = "yes")
-
 AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
                [enable Intel OSPM support]), [enable_iospm=${enableval}])
 AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
@@ -316,7 +258,7 @@ if (test -n "${path_systemdunit}"); then
 fi
 AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
 
-PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes,
+PKG_CHECK_MODULES(XTABLES, xtables >= 1.4.11, dummy=yes,
                                AC_MSG_ERROR(Xtables library is required))
 AC_SUBST(XTABLES_CFLAGS)
 AC_SUBST(XTABLES_LIBS)
@@ -383,6 +325,11 @@ AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner],
                                        [enable_pacrunner=${enableval}])
 AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no")
 
+AC_ARG_ENABLE(neard, AC_HELP_STRING([--disable-neard],
+                               [disable Neard support]),
+                                       [enable_neard=${enableval}])
+AM_CONDITIONAL(NEARD, test "${enable_neard}" != "no")
+
 AC_ARG_ENABLE(wispr, AC_HELP_STRING([--disable-wispr],
                                [disable WISPr support]),
                                        [enable_wispr=${enableval}])
@@ -393,9 +340,18 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
                                        [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
 
+if (test "${enable_tools}" != "no"); then
+       AC_PATH_PROGS(IPTABLES_SAVE, [iptables-save], [],
+                                               $PATH:/sbin:/usr/sbin)
+       IPTABLES_SAVE=$ac_cv_path_IPTABLES_SAVE
+else
+       IPTABLES_SAVE=""
+fi
+AC_SUBST(IPTABLES_SAVE)
+
 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