]>
Commit | Line | Data |
---|---|---|
d22466fa ER |
1 | --- a/configure.ac 2012-03-13 16:15:41.000000000 +0000 |
2 | +++ b/configure.ac 2012-03-31 08:39:24.489010332 +0100 | |
3 | @@ -130,6 +130,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= | |
4 | [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` | |
5 | BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` | |
6 | AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"]) | |
7 | + AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"]) | |
8 | AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library]) | |
9 | AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet]) | |
10 | AC_SUBST([HAVE_BLUETOOTH],[1]) | |
11 | --- a/src/Makefile.am 2012-03-13 16:15:41.000000000 +0000 | |
12 | +++ b/src/Makefile.am 2012-03-31 08:41:42.958012667 +0100 | |
13 | @@ -277,7 +277,7 @@ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_ | |
14 | Cinnamon_0_1_gir_LIBS = libcinnamon.la | |
15 | Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) | |
16 | Cinnamon_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \ | |
17 | - --add-include-path=$(MUFFIN_GIR_DIR) | |
18 | + --add-include-path=$(MUFFIN_GIR_DIR) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),) | |
19 | INTROSPECTION_GIRS += Cinnamon-0.1.gir | |
20 | CLEANFILES += Cinnamon-0.1.gir | |
21 |