From 3afd5d11566aaade76f2eff61b1c2c81deed5ffa Mon Sep 17 00:00:00 2001 From: Xiao-Long Chen Date: Mon, 23 Apr 2012 23:53:56 -0400 Subject: [PATCH] Fix build with gnome-bluetooth 3.4 --- Makefile.in | 1 + browser-plugin/Makefile.in | 1 + configure.ac | 1 + data/Makefile.in | 1 + js/Makefile.in | 1 + man/Makefile.in | 1 + src/Makefile.am | 2 +- src/Makefile.in | 1 + tests/Makefile.in | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index dfb035a..a35f016 100644 --- a/Makefile.in +++ b/Makefile.in @@ -127,6 +127,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLUETOOTH_DIR = @BLUETOOTH_DIR@ BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ diff --git a/browser-plugin/Makefile.in b/browser-plugin/Makefile.in index 04b0118..a30f14b 100644 --- a/browser-plugin/Makefile.in +++ b/browser-plugin/Makefile.in @@ -128,6 +128,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLUETOOTH_DIR = @BLUETOOTH_DIR@ BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ diff --git a/configure.ac b/configure.ac index acdcc03..a5d0b7a 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,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/data/Makefile.in b/data/Makefile.in index 38d2b82..d66494f 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -97,6 +97,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLUETOOTH_DIR = @BLUETOOTH_DIR@ BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ diff --git a/js/Makefile.in b/js/Makefile.in index 95c685c..74146b2 100644 --- a/js/Makefile.in +++ b/js/Makefile.in @@ -94,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLUETOOTH_DIR = @BLUETOOTH_DIR@ BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ diff --git a/man/Makefile.in b/man/Makefile.in index bdf3077..796e3dd 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -95,6 +95,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLUETOOTH_DIR = @BLUETOOTH_DIR@ BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ diff --git a/src/Makefile.am b/src/Makefile.am index 182bf17..a30e4d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -277,7 +277,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) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),) INTROSPECTION_GIRS += Cinnamon-0.1.gir CLEANFILES += Cinnamon-0.1.gir diff --git a/src/Makefile.in b/src/Makefile.in index b7d3cff..0295dcf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -321,6 +321,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLUETOOTH_DIR = @BLUETOOTH_DIR@ BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 6546a7d..6148cf8 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -71,6 +71,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLUETOOTH_DIR = @BLUETOOTH_DIR@ BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ -- 1.7.10