public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in gnome-extra/nm-applet/files: nm-applet-0.8.1-fix-bluetooth-dep.patch
@ 2010-09-14 22:37 Robert Piasek (dagger)
  0 siblings, 0 replies; only message in thread
From: Robert Piasek (dagger) @ 2010-09-14 22:37 UTC (permalink / raw
  To: gentoo-commits

dagger      10/09/14 22:37:56

  Added:                nm-applet-0.8.1-fix-bluetooth-dep.patch
  Log:
  Backported patch which fixes bluetooth dependency automagic
  
  (Portage version: 2.1.9.5/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch?rev=1.1&content-type=text/plain

Index: nm-applet-0.8.1-fix-bluetooth-dep.patch
===================================================================
From e523771e0d68c347763a004a3f9ac100db5cfbb2 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 24 Aug 2010 16:05:01 +0000
Subject: build: allow explicit enabling/disabling of gnome-bluetooth dep (bgo #627663)

---
diff --git a/configure.ac b/configure.ac
index 1ab81f4..b2dd2cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,12 +97,24 @@ fi
 AC_SUBST(DBUS_SYS_DIR)
 
 dnl Check for gnome-bluetooth
-PKG_CHECK_MODULES(GNOME_BLUETOOTH,
-		  gconf-2.0
-		  gnome-bluetooth-1.0 >= 2.27.6
-		  libnm-util >= 0.8.1
-		  libnm-glib >= 0.8.1,
-		  have_gbt=yes, have_gbt=no)
+AC_ARG_WITH([bluetooth],
+	    AS_HELP_STRING([--with-bluetooth|--without-bluetooth], [Enable Bluetooth support]),
+	    with_bluetooth="$withval",with_bluetooth=yes)
+have_gbt=no
+case "${with_bluetooth}" in
+	no)	AC_MSG_NOTICE(Bluetooth support disabled)
+		;;
+	*)
+		AC_MSG_CHECKING(for gnome-bluetooth)
+		PKG_CHECK_MODULES(GNOME_BLUETOOTH,
+				  gconf-2.0
+				  gnome-bluetooth-1.0 >= 2.27.6
+				  libnm-util >= 0.8.1
+				  libnm-glib >= 0.8.1,
+				  have_gbt=yes, have_gbt=no)
+		;;
+esac
+
 AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
--
cgit v0.8.3.1






^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-09-14 22:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-14 22:37 [gentoo-commits] gentoo-x86 commit in gnome-extra/nm-applet/files: nm-applet-0.8.1-fix-bluetooth-dep.patch Robert Piasek (dagger)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox