[gnome-bluetooth] Fix building input helper when GTK+ has no xi support



commit 4662dfda5bb87a9f6f802c1e0e07bbc531ffc236
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Nov 27 02:52:00 2009 +0000

    Fix building input helper when GTK+ has no xi support
    
    https://bugzilla.gnome.org/show_bug.cgi?id=603068

 configure.ac       |    5 +++++
 wizard/Makefile.am |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f0623b0..9e13f98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,6 +125,11 @@ PKG_CHECK_MODULES(WIZARD,
 		  gtk+-2.0
 		  unique-1.0)
 
+dnl Requires for the input helper
+PKG_CHECK_MODULES(INPUT,
+		  xi
+		  gtk+-2.0)
+
 dnl Requires for the public library
 PKG_CHECK_MODULES(LIBGNOMEBT,
 		  dbus-glib-1 >= $DBUS_GLIB_REQUIRED
diff --git a/wizard/Makefile.am b/wizard/Makefile.am
index 786c9b4..3d27947 100644
--- a/wizard/Makefile.am
+++ b/wizard/Makefile.am
@@ -14,9 +14,9 @@ bluetooth_wizard_SOURCES = main.c
 bluetooth_wizard_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la libwizard.la $(WIZARD_LIBS)
 
 test_input_SOURCES = test-input.c bluetooth-input.c bluetooth-input.h
-test_input_LDADD = $(WIZARD_LIBS)
+test_input_LDADD = $(INPUT_LIBS)
 
-AM_CFLAGS = $(WIZARD_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
+AM_CFLAGS = $(WIZARD_CFLAGS) $(INPUT_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
 
 pin_DATA = pin-code-database.xml
 pindir = $(pkgdatadir)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]