applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

region: Link against libxklavier also

Browse source
This commit is contained in:
Didier Roche 2010-11-10 17:06:53 +01:00 • committed by Rodrigo Moya
parent 7c87dce1dc
commit f6bf9efd67
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -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

4
panels/region/Makefile.am
View file

@ -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)