[gnome-control-center] region: Link against libxklavier also



commit f6bf9efd672a22b5b0a2c4153c3ee6328087dc51
Author: Didier Roche <didier roche canonical com>
Date:   Wed Nov 10 17:06:53 2010 +0100

    region: Link against libxklavier also

 configure.ac              |    4 +---
 panels/region/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index eb521e0..542ea9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,9 +152,7 @@ CAPPLET_LIBS="$CAPPLET_LIBS $XINPUT_LIBS"
 dnl ==============
 dnl gswitchit
 dnl ==============
-PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.31.1 libxklavier >= 4.0])
-
-PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 2.31.2])
+PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.31.1 libxklavier >= 4.0 libgnomekbdui >= 2.31.2])
 
 dnl ==============================================
 dnl End: Check that we meet the  dependencies
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
index a655ed8..416ae70 100644
--- a/panels/region/Makefile.am
+++ b/panels/region/Makefile.am
@@ -4,7 +4,7 @@ cappletname = region
 INCLUDES = 						\
 	$(PANEL_CFLAGS)					\
 	$(GNOMECC_CAPPLETS_CFLAGS)			\
-	$(LIBGNOMEKBDUI_CFLAGS)				\
+	$(LIBGNOMEKBD_CFLAGS)				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""
@@ -27,7 +27,7 @@ libregion_la_SOURCES =	\
 	gnome-region-panel-xkbpv.c \
 	gnome-region-panel-xkb.h
 
-libregion_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBDUI_LIBS)
+libregion_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBD_LIBS)
 
 libregion_la_LDFLAGS = $(PANEL_LDFLAGS)
 



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