]>
Commit | Line | Data |
---|---|---|
0ba9c0f7 | 1 | diff -aurN control-center-2.11.91.orig/capplets/keyboard/Makefile.am control-center-2.11.91/capplets/keyboard/Makefile.am |
2 | --- control-center-2.11.91.orig/capplets/keyboard/Makefile.am 2004-11-28 09:14:04.000000000 +0100 | |
3 | +++ control-center-2.11.91/capplets/keyboard/Makefile.am 2005-08-14 23:24:03.000000000 +0200 | |
4 | @@ -10,6 +10,7 @@ | |
5 | gnome_keyboard_properties_LDADD = \ | |
6 | ../accessibility/keyboard/libaccessibility-keyboard.a \ | |
7 | $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \ | |
8 | + $(PANGOXFT_LIBS) \ | |
9 | ../../libgswitchit/libgswitchit.a \ | |
10 | ../../libkbdraw/libkbdraw.a | |
11 | ||
12 | @@ -29,6 +30,6 @@ | |
13 | Desktop_in_files = keyboard.desktop.in | |
14 | desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) | |
15 | ||
16 | -INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS) | |
17 | +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS) $(PANGOXFT_CFLAGS) | |
18 | CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) | |
19 | EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) | |
20 | diff -aurN control-center-2.11.91.orig/configure.in control-center-2.11.91/configure.in | |
21 | --- control-center-2.11.91.orig/configure.in 2005-08-10 11:45:08.000000000 +0200 | |
22 | +++ control-center-2.11.91/configure.in 2005-08-14 23:18:51.000000000 +0200 | |
23 | @@ -97,6 +97,11 @@ | |
24 | libbonobo-2.0 dnl | |
25 | libbonoboui-2.0 dnl | |
26 | gnome-desktop-2.0 >= 2.2.0" | |
27 | + | |
28 | +PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.9.1) | |
29 | +AC_SUBST(PANGOXFT_CFLAGS) | |
30 | +AC_SUBST(PANGOXFT_LIBS) | |
31 | + | |
32 | PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) | |
33 | PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1) | |
34 | PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, |