From f4eaadb948a4b2011647d812f99521199bcde5ea Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 3 Nov 2011 18:26:03 -0400 Subject: [PATCH] Pass bluetooth directory to g-ir-scanner Rather than relying on the .la file that jhbuild deletes, we explicitly tell g-ir-scanner to look in this subdirectory. --- configure.ac | 1 + src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f0ce5e3..a0fc338 100644 --- a/configure.ac +++ b/configure.ac @@ -133,6 +133,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"]) + AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"]) AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library]) AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet]) AC_SUBST([HAVE_BLUETOOTH],[1]) diff --git a/src/Makefile.am b/src/Makefile.am index 1cfea99..9cdfc89 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -275,7 +275,7 @@ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) Cinnamon_0_1_gir_LIBS = libcinnamon.la Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) Cinnamon_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \ - --add-include-path=$(MUFFIN_GIR_DIR) + --add-include-path=$(MUFFIN_GIR_DIR) -L $(BLUETOOTH_DIR) INTROSPECTION_GIRS += Cinnamon-0.1.gir CLEANFILES += Cinnamon-0.1.gir -- 1.7.12