X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=c1b00147fea695d2c25e768af393f5aaac3348e6;hb=e4cdd7c31dd6f5fc9bd1803095a10912ef21591f;hp=2a7ca8771d065588187f5911defa29c46b7741a5;hpb=7c5f70200f076d2afdce9c34dc59ce8fd4e1baba;p=connman

diff --git a/configure.ac b/configure.ac
index 2a7ca87..c1b0014 100644
--- 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}])
@@ -189,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,
@@ -219,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)
@@ -289,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)