[gnome-applets] General: Make NetworkManager support manually selectable

[Callum McKenzie <callum src gnome org>]

commit 7bd3d0e0e2b7e2310510bbf95f1a42179c43fc15
Author: Callum McKenzie <callum spooky-possum org>
Date:   Sun May 31 12:59:38 2009 +1200

    General: Make NetworkManager support manually selectable
    
    Patch from Romain Perier to allow explicit disabling of
    NetworkManager support. See bug 578951.
---
 configure.in |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index 63e3271..95c3dd3 100644
--- a/configure.in
+++ b/configure.in
@@ -311,16 +311,23 @@ AC_SUBST(LIBGWEATHER_LIBS)
 AM_CONDITIONAL(BUILD_LIBGWEATHER_APPLETS, $build_libgweather_applets)
 
 dnl -- check for NetworkManager -----------------------------------------------
-PKG_CHECK_MODULES(NETWORKMANAGER, NetworkManager >= $NETWORKMANAGER_REQUIRED,
-		  HAVE_NETWORKMANAGER="yes", HAVE_NETWORKMANAGER="no")
-
-if test "x$HAVE_NETWORKMANAGER" = "xyes"; then
-	AC_DEFINE(HAVE_NETWORKMANAGER, 1, [NetworkManager available])
+AC_ARG_ENABLE([networkmanager],
+	AC_HELP_STRING([--enable-networkmanager], 
+	[Enable NetworkManager support @<:@default=yes@:>@]),
+	ENABLE_NETWORKMANAGER=$enableval, ENABLE_NETWORKMANAGER=yes)
+
+HAVE_NETWORKMANAGER=no
+if test "x$ENABLE_NETWORKMANAGER" = "xyes"; then
+   PKG_CHECK_MODULES(NETWORKMANAGER, NetworkManager >= $NETWORKMANAGER_REQUIRED,
+   		HAVE_NETWORKMANAGER=yes, HAVE_NETWORKMANAGER=no)
+
+   if x$HAVE_NETWORKMANAGER = xyes; then
+      AC_DEFINE(HAVE_NETWORKMANAGER, 1, [NetworkManager available])
+      AC_SUBST(NETWORKMANAGER_CFLAGS)
+      AC_SUBST(NETWORKMANAGER_LIBS)
+   fi
 fi
 
-AC_SUBST(NETWORKMANAGER_CFLAGS)
-AC_SUBST(NETWORKMANAGER_LIBS)
-
 dnl -- check for the Mixer ----------------------------------------------------
 AC_ARG_ENABLE([mixer-applet],
     AC_HELP_STRING([--enable-mixer-applet], [Enable the gstreamer-based mixer applet.]),