[balsa/gtk3] Fix broken NetworkManager-glib logic



commit 88920b27a96e962363b8bb06bb4bc88dc6d50401
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Apr 30 18:05:30 2013 -0400

    Fix broken NetworkManager-glib logic
    
        * configure.ac: fix broken NetworkManager-glib logic.

 ChangeLog    |    4 ++++
 configure.ac |   21 +++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 95b3f1d..ce1a4e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-30  Peter Bloomfield
+
+       * configure.ac: fix broken NetworkManager-glib logic.
+
 2013-04-29  Peter Bloomfield
 
        * src/sendmsg-window.c (delete_handler): tell the user the
diff --git a/configure.ac b/configure.ac
index 54cd765..b594e59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -752,21 +752,22 @@ if test x$with_libnotify != xno; then
 fi
 
 # NetworkManager
+AC_MSG_CHECKING([whether to use NetworkManager])
 if test "$with_nm" != no ; then
   if $PKG_CONFIG --atleast-version=2.32.0 glib-2.0 ; then
     with_nm="no; using GNetworkMonitor instead"
+  else
+    PKG_CHECK_EXISTS([libnm-glib], 
+    [ PKG_CHECK_MODULES(LIBNM_GLIB, [ libnm-glib >= 0.7.0]) ],
+    [ PKG_CHECK_MODULES(LIBNM_GLIB, [ libnm_glib >= 0.7.0]) ])
+
+    AC_DEFINE(HAVE_LIBNM_GLIB,1,
+              [ Defined if NetworkManager-glib-devel is found.])
+    BALSA_CFLAGS="$BALSA_CFLAGS $LIBNM_GLIB_CFLAGS"
+    LIBS="$LIBS $LIBNM_GLIB_LIBS"
   fi
-  PKG_CHECK_EXISTS([libnm-glib], 
-  [ PKG_CHECK_MODULES(LIBNM_GLIB, [ libnm-glib >= 0.7.0]) ],
-  [ PKG_CHECK_MODULES(LIBNM_GLIB, [ libnm_glib >= 0.7.0]) ])
-
-  AC_DEFINE(HAVE_LIBNM_GLIB,1,[ Defined if NetworkManager-glib-devel is found.])
-  BALSA_CFLAGS="$BALSA_CFLAGS $LIBNM_GLIB_CFLAGS"
-  LIBS="$LIBS $LIBNM_GLIB_LIBS"
-else
-AC_MSG_CHECKING([NetworkManager-glib-devel])
- AC_MSG_RESULT([no])
 fi
+AC_MSG_RESULT($with_nm)
 
 # Compface configuration
 #


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]