aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-20 00:34:03 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-20 00:34:03 +0800
commit3336ae452410f53254957b48b72460978f3b990a (patch)
tree7e39b9a4d6706aba72d8042be350b54d3ecd15e4
parent98bdc25304295c21761ee6d5547273d5f077f61b (diff)
downloadgsoc2013-empathy-3336ae452410f53254957b48b72460978f3b990a.tar
gsoc2013-empathy-3336ae452410f53254957b48b72460978f3b990a.tar.gz
gsoc2013-empathy-3336ae452410f53254957b48b72460978f3b990a.tar.bz2
gsoc2013-empathy-3336ae452410f53254957b48b72460978f3b990a.tar.lz
gsoc2013-empathy-3336ae452410f53254957b48b72460978f3b990a.tar.xz
gsoc2013-empathy-3336ae452410f53254957b48b72460978f3b990a.tar.zst
gsoc2013-empathy-3336ae452410f53254957b48b72460978f3b990a.zip
configure: code clean up when choosing the connectivity
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--configure.ac29
1 files changed, 12 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 00c6b4da5..bc0491cae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,38 +164,33 @@ AC_ARG_WITH(connectivity,
[build with connectivity support]), ,
with_connectivity=auto)
-PKG_CHECK_MODULES(NETWORK_MANAGER,
-[
- libnm_glib >= $NETWORK_MANAGER_REQUIRED
-], have_nm="yes", have_nm="no")
-
-PKG_CHECK_MODULES(CONNMAN,
-[
- dbus-glib-1
-], have_connman="yes", have_connman="no")
-
if test "x$with_connectivity" = "xno"; then
have_nm=no
have_connman=no
-elif test "x$with_connectivity" = "xnm"; then
- if test "x$have_nm" = "xyes"; then
- AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
- have_connman=no
- fi
-
elif test "x$with_connectivity" = "xconnman"; then
+
+ PKG_CHECK_MODULES(CONNMAN,
+ [
+ dbus-glib-1
+ ], have_connman="yes", have_connman="no")
+
if test "x$have_connman" = "xyes"; then
AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
have_nm=no
fi
else
+
+ PKG_CHECK_MODULES(NETWORK_MANAGER,
+ [
+ libnm_glib >= $NETWORK_MANAGER_REQUIRED
+ ], have_nm="yes", have_nm="no")
+
if test "x$have_nm" = "xyes"; then
AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
have_connman=no
fi
-
fi
if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then