Release 0.58

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

diff --git a/configure.ac b/configure.ac
index 7b895d7..c36d53b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 0.54)
+AC_INIT(connman, 0.58)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -98,23 +98,6 @@ AC_ARG_ENABLE(ofono,
 AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
 AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin")
 
-AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM],
-       [specify location of udhcpc binary]), [path_udhcpc=${withval}])
-
-AC_ARG_ENABLE(udhcp,
-       AC_HELP_STRING([--enable-udhcp], [enable uDHCP support]),
-                       [enable_udhcp=${enableval}], [enable_udhcp="no"])
-if (test "${enable_udhcp}" != "no"); then
-       if (test -z "${path_udhcpc}"); then
-               AC_PATH_PROG(UDHCPC, [udhcpc], [], $PATH:/sbin:/usr/sbin)
-       else
-               UDHCPC="${path_udhcpc}"
-               AC_SUBST(UDHCPC)
-       fi
-fi
-AM_CONDITIONAL(UDHCP, test "${enable_udhcp}" != "no")
-AM_CONDITIONAL(UDHCP_BUILTIN, test "${enable_udhcp}" = "builtin")
-
 AC_ARG_WITH(dhclient, AC_HELP_STRING([--with-dhclient=PROGRAM],
        [specify location of dhclient binary]), [path_dhclient=${withval}])
 
@@ -128,33 +111,10 @@ if (test "${enable_dhclient}" != "no"); then
                DHCLIENT="${path_dhclient}"
                AC_SUBST(DHCLIENT)
        fi
-       AC_MSG_CHECKING(dhclient major version)
-       version_dhclient=`${DHCLIENT} --version 2>&1 | sed '/^isc-dhclient-*/!d; s///; s/\..*//;q'`
-       AC_MSG_RESULT(${version_dhclient})
-       if (test "${version_dhclient}" = "4"); then
-               AC_DEFINE(HAVE_DHCLIENT_HOSTNAME, 1, [Define to 1 if you have dhclient hostname support.])
-       fi
 fi
 AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" != "no")
 AM_CONDITIONAL(DHCLIENT_BUILTIN, test "${enable_dhclient}" = "builtin")
 
-AC_ARG_WITH(resolvconf, AC_HELP_STRING([--with-resolvconf=PROGRAM],
-       [specify location of resolvconf binary]), [path_resolvconf=${withval}])
-
-AC_ARG_ENABLE(resolvconf,
-       AC_HELP_STRING([--enable-resolvconf], [enable resolvconf support]),
-                       [enable_resolvconf=${enableval}], [enable_resolvconf="no"])
-if (test "${enable_resolvconf}" != "no"); then
-       if (test -z "${path_resolvconf}"); then
-               AC_PATH_PROG(RESOLVCONF, [resolvconf], [], $PATH:/sbin:/usr/sbin)
-       else
-               RESOLVCONF="${path_resolvconf}"
-               AC_SUBST(RESOLVCONF)
-       fi
-fi
-AM_CONDITIONAL(RESOLVCONF, test "${enable_resolvconf}" != "no")
-AM_CONDITIONAL(RESOLVCONF_BUILTIN, test "${enable_resolvconf}" = "builtin")
-
 AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM],
         [specify location of openconnect binary]), [path_openconnect=${withval}])
 
@@ -194,12 +154,7 @@ 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"])
-if (test "${enable_dnsproxy}" != "no"); then
-       AC_CHECK_HEADERS(resolv.h, dummy=yes,
-                       AC_MSG_ERROR(resolver header files are required))
-       AC_CHECK_LIB(resolv, ns_initparse, dummy=yes,
-                       AC_MSG_ERROR(resolver library support is required))
-fi
+
 AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" != "no")
 AM_CONDITIONAL(DNSPROXY_BUILTIN, test "${enable_dnsproxy}" = "builtin")
 
@@ -215,6 +170,11 @@ AC_ARG_ENABLE(meego,
 AM_CONDITIONAL(MEEGO, test "${enable_meego}" != "no")
 AM_CONDITIONAL(MEEGO_BUILTIN, test "${enable_meego}" = "builtin")
 
+AC_CHECK_HEADERS(resolv.h, dummy=yes,
+       AC_MSG_ERROR(resolver header files are required))
+AC_CHECK_LIB(resolv, ns_initparse, dummy=yes,
+       AC_MSG_ERROR(resolver library support is required))
+
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
                        AC_MSG_ERROR(dynamic linking loader is required))
 
@@ -353,6 +313,11 @@ 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)