Remove obsolete file.

[connman] / configure.ac

diff --git a/configure.ac b/configure.ac
index c9a4336..c1b0014 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,8 @@ AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin")
 AC_ARG_ENABLE(modemmgr,
        AC_HELP_STRING([--enable-modemmgr], [enable Modem Manager support]),
                        [enable_modemmgr=${enableval}], [enable_modemmgr="no"])
-AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" = "yes")
+AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" != "no")
+AM_CONDITIONAL(MODEMMGR_BUILTIN, test "${enable_modemmgr}" = "builtin")
 
 AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM],
        [specify location of udhcpc binary]), [path_udhcpc=${withval}])
@@ -152,9 +153,11 @@ AC_ARG_ENABLE(huawei, AC_HELP_STRING([--enable-huawei],
                [enable HUAWEI support]), [enable_huawei=${enableval}])
 AM_CONDITIONAL(HUAWEI, test "${enable_huawei}" = "yes")
 
-AC_ARG_ENABLE(hso, AC_HELP_STRING([--enable-hso],
-               [enable HSO support]), [enable_hso=${enableval}])
-AM_CONDITIONAL(HSO, test "${enable_hso}" = "yes")
+AC_ARG_ENABLE(hso,
+       AC_HELP_STRING([--enable-hso], [enable HSO support]),
+                       [enable_hso=${enableval}], [enable_hso="no"])
+AM_CONDITIONAL(HSO, test "${enable_hso}" != "no")
+AM_CONDITIONAL(HSO_BUILTIN, test "${enable_hso}" = "builtin")
 
 AC_ARG_WITH(pppd, AC_HELP_STRING([--with-pppd=PROGRAM],
        [specify location of pppd binary]), [path_pppd=${withval}])
@@ -187,7 +190,7 @@ AC_ARG_ENABLE(udev, AC_HELP_STRING([--enable-udev],
                [enable udev support]), [enable_udev=${enableval}])
 if (test "${enable_udev}" = "yes"); then
        AC_DEFINE(HAVE_UDEV, 1, [Define if udev support is available])
-       PKG_CHECK_MODULES(UDEV, libudev >= 129, enable_udev=yes,
+       PKG_CHECK_MODULES(UDEV, libudev >= 129, dummy=yes,
                                AC_MSG_ERROR(udev >= 129 is required))
        AC_CHECK_LIB(udev, udev_enumerate_add_match_property, dummy=yes,
                AC_DEFINE(NEED_UDEV_ENUMERATE_ADD_MATCH_PROPERTY, 1,
@@ -217,7 +220,7 @@ AC_ARG_ENABLE(iwmx, AC_HELP_STRING([--enable-iwmx],
 if (test "${enable_iwmx}" = "yes"); then
        enable_threads="yes"
        export PKG_CONFIG_PATH="${pkgconfig_iwmxsdk}"
-       PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, enable_iwmx=yes,
+       PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, dummy=yes,
                                AC_MSG_ERROR(Intel WiMAX SDK is required))
        PKG_CONFIG_PATH=""
        AC_SUBST(IWMXSDK_CFLAGS)
@@ -263,10 +266,11 @@ AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
 AC_SUBST([GATCHAT_CFLAGS], ['-I$(top_srcdir)/gatchat'])
 AC_SUBST([GATCHAT_LIBS], ['$(top_builddir)/gatchat/libgatchat.la'])
 
-AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit],
-               [enable PolicyKit support]), [enable_polkit=${enableval}])
-if (test "${enable_polkit}" = "yes"); then
-       PKG_CHECK_MODULES(POLKIT, polkit-dbus >= 0.7, enable_polkit=yes,
+AC_ARG_ENABLE(polkit,
+       AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]),
+                       [enable_polkit=${enableval}], [enable_polkit="no"])
+if (test "${enable_polkit}" != "no"); then
+       PKG_CHECK_MODULES(POLKIT, polkit-dbus >= 0.7, dummy=yes,
                                AC_MSG_ERROR(PolicyKit >= 0.7 is required))
        AC_SUBST(POLKIT_CFLAGS)
        AC_SUBST(POLKIT_LIBS)
@@ -276,7 +280,8 @@ if (test "${enable_polkit}" = "yes"); then
        fi
        AC_SUBST(POLKIT_DATADIR)
 fi
-AM_CONDITIONAL(POLKIT, test "${enable_polkit}" = "yes")
+AM_CONDITIONAL(POLKIT, test "${enable_polkit}" != "no")
+AM_CONDITIONAL(POLKIT_BUILTIN, test "${enable_polkit}" = "builtin")
 
 AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client],
                [enable command line client]), [enable_client=${enableval}])
@@ -285,7 +290,7 @@ 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, enable_netlink=yes,
+       PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes,
                                AC_MSG_ERROR(Netlink library is required))
        AC_SUBST(NETLINK_CFLAGS)
        AC_SUBST(NETLINK_LIBS)