[empathy] Cleanup nm/conman pkg check

[Xavier Claessens <xclaesse src gnome org>]

commit 62bd07ab4997bb1959c1095fcce91f97c2878a8d
Author: Xavier Claessens <xclaesse gmail com>
Date:   Thu Jul 8 16:27:23 2010 +0200

    Cleanup nm/conman pkg check
    
    No need to check for libnm_glib twice

 configure.ac |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e004410..2bba277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,6 +235,7 @@ if test "x$with_connectivity" = "xno"; then
    have_connman=no
 
 elif test "x$with_connectivity" = "xconnman"; then
+   have_nm=no
 
    PKG_CHECK_MODULES(CONNMAN,
    [
@@ -243,10 +244,10 @@ elif test "x$with_connectivity" = "xconnman"; then
 
    if test "x$have_connman" = "xyes"; then
       AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
-      have_nm=no
    fi
 
 else
+   have_connman=no
 
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
@@ -255,17 +256,6 @@ else
 
    if test "x$have_nm" = "xyes"; then
       AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
-      have_connman=no
-   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
 fi