From d15e9df8903c05fa0e355b3b1b133171c706d3ac Mon Sep 17 00:00:00 2001 From: Sobhan Mohammadpour Date: Thu, 28 Feb 2013 18:48:32 +0330 Subject: [PATCH 2/3] Make bluetooth support optional https://bugs.gentoo.org/show_bug.cgi?id=398145 Ed Catmur 2012-01-08 13:46:22 UTC libgnome-bluetooth-applet is a private library so they shouldn't be linking against it anyway. I tried to work out how to tell libtool to add it to rpath but got totally lost. I'll see if I can work out how to fix the automagic gnome-bluetooth dependency so I can at least merge USE=-bluetooth. --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 334323a..e749ca6 100644 --- a/configure.ac +++ b/configure.ac @@ -116,6 +116,10 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4) PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8) AC_MSG_CHECKING([for bluetooth support]) +AC_ARG_WITH([bluetooth], + AS_HELP_STRING([--without-bluetooth], + [Build without gnome-bluetooth library (default: auto)])) +AS_IF([test "x$with_bluetooth" != "xno"], [ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0], [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` @@ -128,6 +132,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0], [AC_DEFINE([HAVE_BLUETOOTH],[0]) AC_SUBST([HAVE_BLUETOOTH],[0]) AC_MSG_RESULT([no])]) +], [AC_DEFINE([HAVE_BLUETOOTH],[0]) + AC_SUBST([HAVE_BLUETOOTH],[0]) + AC_MSG_RESULT([no])]) PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0) AC_SUBST(CALENDAR_SERVER_CFLAGS) -- 1.8.5.1