diff -ruN control-center-2.20.3.orig/capplets/Makefile.am control-center-2.20.3/capplets/Makefile.am --- control-center-2.20.3.orig/capplets/Makefile.am 2008-01-08 14:19:03.000000000 +0100 +++ control-center-2.20.3/capplets/Makefile.am 2008-01-25 10:49:56.000000000 +0100 @@ -4,7 +4,6 @@ appearance \ default-applications \ keybindings \ - keyboard \ mouse \ network \ windows diff -ruN control-center-2.20.3.orig/capplets/windows/Makefile.am control-center-2.20.3/capplets/windows/Makefile.am --- control-center-2.20.3.orig/capplets/windows/Makefile.am 2008-01-08 14:18:56.000000000 +0100 +++ control-center-2.20.3/capplets/windows/Makefile.am 2008-01-25 11:00:42.000000000 +0100 @@ -20,7 +20,7 @@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ -I$(top_srcdir)/libwindow-settings \ - -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ + -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \ -DGLADEDIR=\""$(gladedir)"\" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DPIXMAPDIR=\""$(pixmapdir)"\" diff -ruN control-center-2.20.3.orig/configure.in control-center-2.20.3/configure.in --- control-center-2.20.3.orig/configure.in 2008-01-08 14:19:33.000000000 +0100 +++ control-center-2.20.3/configure.in 2008-01-25 14:33:18.000000000 +0100 @@ -79,7 +79,7 @@ #endif ])]) AC_SUBST(XF86MISC_LIBS) -AC_CHECK_HEADERS(X11/extensions/XKB.h) +dnl AC_CHECK_HEADERS(X11/extensions/XKB.h) CPPFLAGS=$savecppflags dnl ============================================== @@ -193,13 +193,13 @@ dnl ============== dnl gswitchit dnl ============== -PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 0.1 libxklavier >= 3.2]) -AC_SUBST(LIBGNOMEKBD_CFLAGS) -AC_SUBST(LIBGNOMEKBD_LIBS) - -PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 0.1]) -AC_SUBST(LIBGNOMEKBDUI_CFLAGS) -AC_SUBST(LIBGNOMEKBDUI_LIBS) +dnl PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 0.1 libxklavier >= 3.2]) +dnl AC_SUBST(LIBGNOMEKBD_CFLAGS) +dnl AC_SUBST(LIBGNOMEKBD_LIBS) + +dnl PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 0.1]) +dnl AC_SUBST(LIBGNOMEKBDUI_CFLAGS) +dnl AC_SUBST(LIBGNOMEKBDUI_LIBS) dnl ============================================== dnl themus and fontilus dependencies diff -ruN control-center-2.20.3.orig/debian/control control-center-2.20.3/debian/control --- control-center-2.20.3.orig/debian/control 2008-01-25 14:19:04.000000000 +0100 +++ control-center-2.20.3/debian/control 2008-01-25 14:33:19.000000000 +0100 @@ -50,13 +50,11 @@ libdbus-glib-1-dev (>= 0.32), librsvg2-dev, libpanel-applet2-dev, - libgnomekbd-dev (>= 0.1), shared-mime-info, libslab-dev, libpango1.0-dev (>= 1.17), - libgnomekbdui-dev (>= 0.1), - scrollkeeper, - libxklavier11-dev (>= 3.2) + scrollkeeper +Build-Conflicts: libxklavier11-dev, libgnomekbd-dev, libgnomekbdui-dev Package: gnome-control-center Architecture: any diff -ruN control-center-2.20.3.orig/debian/control.in control-center-2.20.3/debian/control.in --- control-center-2.20.3.orig/debian/control.in 2008-01-25 14:19:04.000000000 +0100 +++ control-center-2.20.3/debian/control.in 2008-01-25 14:24:17.000000000 +0100 @@ -50,13 +50,11 @@ libdbus-glib-1-dev (>= 0.32), librsvg2-dev, libpanel-applet2-dev, - libgnomekbd-dev (>= 0.1), shared-mime-info, libslab-dev, libpango1.0-dev (>= 1.17), - libgnomekbdui-dev (>= 0.1), - scrollkeeper, - libxklavier11-dev (>= 3.2) + scrollkeeper +Build-Conflicts: libxklavier11-dev, libgnomekbd-dev, libgnomekbdui-dev Package: gnome-control-center Architecture: any diff -ruN control-center-2.20.3.orig/debian/patches/25_window_manager_settings.patch control-center-2.20.3/debian/patches/25_window_manager_settings.patch --- control-center-2.20.3.orig/debian/patches/25_window_manager_settings.patch 2008-01-25 14:19:04.000000000 +0100 +++ control-center-2.20.3/debian/patches/25_window_manager_settings.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -diff -Nur control-center-2.16.3/capplets/windows/Makefile.am control-center-2.16.3.new/capplets/windows/Makefile.am ---- control-center-2.16.3/capplets/windows/Makefile.am 2007-01-29 12:10:38.000000000 +0100 -+++ control-center-2.16.3.new/capplets/windows/Makefile.am 2007-03-17 15:25:59.000000000 +0100 -@@ -17,7 +17,7 @@ - - INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ - -I$(top_srcdir)/libwindow-settings \ -- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ -+ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DPIXMAPDIR=\""$(pixmapdir)"\" - -diff -Nur control-center-2.16.3/capplets/windows/Makefile.in control-center-2.16.3.new/capplets/windows/Makefile.in ---- control-center-2.16.3/capplets/windows/Makefile.in 2007-01-30 10:28:40.000000000 +0100 -+++ control-center-2.16.3.new/capplets/windows/Makefile.in 2007-03-17 15:25:59.000000000 +0100 -@@ -343,7 +343,7 @@ - desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) - INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ - -I$(top_srcdir)/libwindow-settings \ -- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ -+ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DPIXMAPDIR=\""$(pixmapdir)"\" - -diff -Nur control-center-2.16.3/libwindow-settings/Makefile.am control-center-2.16.3.new/libwindow-settings/Makefile.am ---- control-center-2.16.3/libwindow-settings/Makefile.am 2007-01-29 12:10:31.000000000 +0100 -+++ control-center-2.16.3.new/libwindow-settings/Makefile.am 2007-03-17 15:25:59.000000000 +0100 -@@ -1,4 +1,4 @@ --WM_MODULE_DIR=$(libdir)/window-manager-settings -+WM_MODULE_DIR=$(libdir)/libgnome-window-settings1 - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -diff -Nur control-center-2.16.3/libwindow-settings/Makefile.in control-center-2.16.3.new/libwindow-settings/Makefile.in ---- control-center-2.16.3/libwindow-settings/Makefile.in 2007-01-30 10:28:47.000000000 +0100 -+++ control-center-2.16.3.new/libwindow-settings/Makefile.in 2007-03-17 15:26:58.000000000 +0100 -@@ -345,7 +345,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --WM_MODULE_DIR = $(libdir)/window-manager-settings -+WM_MODULE_DIR = $(libdir)/libgnome-window-settings1 - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ diff -ruN control-center-2.20.3.orig/debian/patches/70_relibtoolize.patch control-center-2.20.3/debian/patches/70_relibtoolize.patch --- control-center-2.20.3.orig/debian/patches/70_relibtoolize.patch 2008-01-25 14:19:04.000000000 +0100 +++ control-center-2.20.3/debian/patches/70_relibtoolize.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,1241 +0,0 @@ -diff -Naur control-center-2.20.3.old/aclocal.m4 control-center-2.20.3/aclocal.m4 ---- control-center-2.20.3.old/aclocal.m4 2008-01-08 14:28:10.000000000 +0100 -+++ control-center-2.20.3/aclocal.m4 2008-01-12 07:40:18.000000000 +0100 -@@ -682,7 +682,7 @@ - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 51 Debian 1.5.24-2ubuntu1 AC_PROG_LIBTOOL -+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -diff -Naur control-center-2.20.3.old/capplets/about-me/Makefile.in control-center-2.20.3/capplets/about-me/Makefile.in ---- control-center-2.20.3.old/capplets/about-me/Makefile.in 2008-01-08 14:28:15.000000000 +0100 -+++ control-center-2.20.3/capplets/about-me/Makefile.in 2008-01-12 07:40:32.000000000 +0100 -@@ -215,8 +215,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -250,6 +248,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/accessibility/at-properties/Makefile.in control-center-2.20.3/capplets/accessibility/at-properties/Makefile.in ---- control-center-2.20.3.old/capplets/accessibility/at-properties/Makefile.in 2008-01-08 14:28:15.000000000 +0100 -+++ control-center-2.20.3/capplets/accessibility/at-properties/Makefile.in 2008-01-12 07:40:33.000000000 +0100 -@@ -213,8 +213,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -248,6 +246,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/accessibility/keyboard/Makefile.in control-center-2.20.3/capplets/accessibility/keyboard/Makefile.in ---- control-center-2.20.3.old/capplets/accessibility/keyboard/Makefile.in 2008-01-08 14:28:15.000000000 +0100 -+++ control-center-2.20.3/capplets/accessibility/keyboard/Makefile.in 2008-01-12 07:40:33.000000000 +0100 -@@ -222,8 +222,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -257,6 +255,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/accessibility/Makefile.in control-center-2.20.3/capplets/accessibility/Makefile.in ---- control-center-2.20.3.old/capplets/accessibility/Makefile.in 2008-01-08 14:28:15.000000000 +0100 -+++ control-center-2.20.3/capplets/accessibility/Makefile.in 2008-01-12 07:40:33.000000000 +0100 -@@ -184,8 +184,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -219,6 +217,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/appearance/data/Makefile.in control-center-2.20.3/capplets/appearance/data/Makefile.in ---- control-center-2.20.3.old/capplets/appearance/data/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/appearance/data/Makefile.in 2008-01-12 07:40:34.000000000 +0100 -@@ -194,8 +194,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -229,6 +227,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/appearance/Makefile.in control-center-2.20.3/capplets/appearance/Makefile.in ---- control-center-2.20.3.old/capplets/appearance/Makefile.in 2008-01-08 14:28:15.000000000 +0100 -+++ control-center-2.20.3/capplets/appearance/Makefile.in 2008-01-12 07:40:34.000000000 +0100 -@@ -220,8 +220,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -255,6 +253,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/common/Makefile.in control-center-2.20.3/capplets/common/Makefile.in ---- control-center-2.20.3.old/capplets/common/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/common/Makefile.in 2008-01-12 07:40:35.000000000 +0100 -@@ -204,8 +204,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -239,6 +237,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/default-applications/Makefile.in control-center-2.20.3/capplets/default-applications/Makefile.in ---- control-center-2.20.3.old/capplets/default-applications/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/default-applications/Makefile.in 2008-01-12 07:40:35.000000000 +0100 -@@ -222,8 +222,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -257,6 +255,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/display/Makefile.in control-center-2.20.3/capplets/display/Makefile.in ---- control-center-2.20.3.old/capplets/display/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/display/Makefile.in 2008-01-12 07:40:36.000000000 +0100 -@@ -223,8 +223,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -258,6 +256,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/keybindings/Makefile.in control-center-2.20.3/capplets/keybindings/Makefile.in ---- control-center-2.20.3.old/capplets/keybindings/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/keybindings/Makefile.in 2008-01-12 07:40:36.000000000 +0100 -@@ -214,8 +214,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -249,6 +247,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/keyboard/Makefile.in control-center-2.20.3/capplets/keyboard/Makefile.in ---- control-center-2.20.3.old/capplets/keyboard/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/keyboard/Makefile.in 2008-01-12 07:40:36.000000000 +0100 -@@ -218,8 +218,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -253,6 +251,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/Makefile.in control-center-2.20.3/capplets/Makefile.in ---- control-center-2.20.3.old/capplets/Makefile.in 2008-01-08 14:28:15.000000000 +0100 -+++ control-center-2.20.3/capplets/Makefile.in 2008-01-12 07:40:32.000000000 +0100 -@@ -186,8 +186,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -221,6 +219,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/mouse/Makefile.in control-center-2.20.3/capplets/mouse/Makefile.in ---- control-center-2.20.3.old/capplets/mouse/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/mouse/Makefile.in 2008-01-12 07:40:37.000000000 +0100 -@@ -208,8 +208,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -243,6 +241,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/network/Makefile.in control-center-2.20.3/capplets/network/Makefile.in ---- control-center-2.20.3.old/capplets/network/Makefile.in 2008-01-08 14:28:16.000000000 +0100 -+++ control-center-2.20.3/capplets/network/Makefile.in 2008-01-12 07:40:37.000000000 +0100 -@@ -221,8 +221,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -256,6 +254,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/sound/Makefile.in control-center-2.20.3/capplets/sound/Makefile.in ---- control-center-2.20.3.old/capplets/sound/Makefile.in 2008-01-08 14:28:17.000000000 +0100 -+++ control-center-2.20.3/capplets/sound/Makefile.in 2008-01-12 07:40:38.000000000 +0100 -@@ -225,8 +225,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -260,6 +258,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/capplets/windows/Makefile.in control-center-2.20.3/capplets/windows/Makefile.in ---- control-center-2.20.3.old/capplets/windows/Makefile.in 2008-01-12 07:39:20.000000000 +0100 -+++ control-center-2.20.3/capplets/windows/Makefile.in 2008-01-12 07:40:38.000000000 +0100 -@@ -210,8 +210,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -245,6 +243,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/configure control-center-2.20.3/configure ---- control-center-2.20.3.old/configure 2008-01-08 14:28:14.000000000 +0100 -+++ control-center-2.20.3/configure 2008-01-12 07:40:29.000000000 +0100 -@@ -935,10 +935,6 @@ - TYPING_BREAK - SCREENSAVER_LIBS - XF86MISC_LIBS --ENABLE_DYNAMIC_LIBSLAB_TRUE --ENABLE_DYNAMIC_LIBSLAB_FALSE --LIBSLAB_CFLAGS --LIBSLAB_LIBS - CAPPLET_CFLAGS - CAPPLET_LIBS - GNOMECC_CFLAGS -@@ -961,6 +957,8 @@ - DEFAULT_APPLICATIONS_CAPPLET_LIBS - METACITY_CFLAGS - METACITY_LIBS -+SLAB_CFLAGS -+SLAB_LIBS - TYPING_CFLAGS - TYPING_LIBS - HAVE_XINPUT_TRUE -@@ -1057,8 +1055,6 @@ - FFLAGS - PKG_CONFIG - XMKMF --LIBSLAB_CFLAGS --LIBSLAB_LIBS - CAPPLET_CFLAGS - CAPPLET_LIBS - GNOMECC_CFLAGS -@@ -1081,6 +1077,8 @@ - DEFAULT_APPLICATIONS_CAPPLET_LIBS - METACITY_CFLAGS - METACITY_LIBS -+SLAB_CFLAGS -+SLAB_LIBS - TYPING_CFLAGS - TYPING_LIBS - FONT_CAPPLET_CFLAGS -@@ -1762,10 +1760,6 @@ - FFLAGS Fortran 77 compiler flags - PKG_CONFIG path to pkg-config utility - XMKMF Path to xmkmf, Makefile generator for X Window System -- LIBSLAB_CFLAGS -- C compiler flags for LIBSLAB, overriding pkg-config -- LIBSLAB_LIBS -- linker flags for LIBSLAB, overriding pkg-config - CAPPLET_CFLAGS - C compiler flags for CAPPLET, overriding pkg-config - CAPPLET_LIBS -@@ -1808,6 +1802,8 @@ - C compiler flags for METACITY, overriding pkg-config - METACITY_LIBS - linker flags for METACITY, overriding pkg-config -+ SLAB_CFLAGS C compiler flags for SLAB, overriding pkg-config -+ SLAB_LIBS linker flags for SLAB, overriding pkg-config - TYPING_CFLAGS - C compiler flags for TYPING, overriding pkg-config - TYPING_LIBS linker flags for TYPING, overriding pkg-config -@@ -6203,7 +6199,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6206 "configure"' > conftest.$ac_ext -+ echo '#line 6202 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -8540,11 +8536,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8543: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8539: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8547: \$? = $ac_status" >&5 -+ echo "$as_me:8543: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8830,11 +8826,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8833: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8829: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8837: \$? = $ac_status" >&5 -+ echo "$as_me:8833: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8934,11 +8930,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8937: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8933: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8941: \$? = $ac_status" >&5 -+ echo "$as_me:8937: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -11296,7 +11292,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <&5) -+ (eval echo "\"\$as_me:13815: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13823: \$? = $ac_status" >&5 -+ echo "$as_me:13819: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -13920,11 +13916,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13923: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13919: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13927: \$? = $ac_status" >&5 -+ echo "$as_me:13923: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -15497,11 +15493,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15500: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15496: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15504: \$? = $ac_status" >&5 -+ echo "$as_me:15500: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -15601,11 +15597,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15604: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15600: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15608: \$? = $ac_status" >&5 -+ echo "$as_me:15604: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -17801,11 +17797,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17804: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17800: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17808: \$? = $ac_status" >&5 -+ echo "$as_me:17804: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18091,11 +18087,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18094: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18090: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18098: \$? = $ac_status" >&5 -+ echo "$as_me:18094: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18195,11 +18191,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18198: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18194: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18202: \$? = $ac_status" >&5 -+ echo "$as_me:18198: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -25184,130 +25180,10 @@ - CPPFLAGS=$savecppflags - - --ENABLE_DYNAMIC_LIBSLAB=0 -- if test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1"; then -- ENABLE_DYNAMIC_LIBSLAB_TRUE= -- ENABLE_DYNAMIC_LIBSLAB_FALSE='#' --else -- ENABLE_DYNAMIC_LIBSLAB_TRUE='#' -- ENABLE_DYNAMIC_LIBSLAB_FALSE= --fi -- - - COMMON_MODULES="gtk+-2.0 >= 2.3.0 gconf-2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 >= 2.0.0 libbonobo-2.0 libbonoboui-2.0 gnome-desktop-2.0 >= 2.2.0" - - pkg_failed=no --{ echo "$as_me:$LINENO: checking for LIBSLAB" >&5 --echo $ECHO_N "checking for LIBSLAB... $ECHO_C" >&6; } -- --if test -n "$PKG_CONFIG"; then -- if test -n "$LIBSLAB_CFLAGS"; then -- pkg_cv_LIBSLAB_CFLAGS="$LIBSLAB_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango\"") >&5 -- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_LIBSLAB_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$LIBSLAB_LIBS"; then -- pkg_cv_LIBSLAB_LIBS="$LIBSLAB_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango\"") >&5 -- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_LIBSLAB_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango"` -- else -- LIBSLAB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$LIBSLAB_PKG_ERRORS" >&5 -- -- { { echo "$as_me:$LINENO: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango) were not met: -- --$LIBSLAB_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables LIBSLAB_CFLAGS --and LIBSLAB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&5 --echo "$as_me: error: Package requirements ($COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango) were not met: -- --$LIBSLAB_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables LIBSLAB_CFLAGS --and LIBSLAB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&2;} -- { (exit 1); exit 1; }; } --elif test $pkg_failed = untried; then -- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables LIBSLAB_CFLAGS --and LIBSLAB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see . --See \`config.log' for more details." >&5 --echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables LIBSLAB_CFLAGS --and LIBSLAB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see . --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- LIBSLAB_CFLAGS=$pkg_cv_LIBSLAB_CFLAGS -- LIBSLAB_LIBS=$pkg_cv_LIBSLAB_LIBS -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- : --fi -- --pkg_failed=no - { echo "$as_me:$LINENO: checking for CAPPLET" >&5 - echo $ECHO_N "checking for CAPPLET... $ECHO_C" >&6; } - -@@ -26529,6 +26405,117 @@ - fi - - pkg_failed=no -+{ echo "$as_me:$LINENO: checking for SLAB" >&5 -+echo $ECHO_N "checking for SLAB... $ECHO_C" >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$SLAB_CFLAGS"; then -+ pkg_cv_SLAB_CFLAGS="$SLAB_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libslab\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libslab") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_SLAB_CFLAGS=`$PKG_CONFIG --cflags "libslab" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$SLAB_LIBS"; then -+ pkg_cv_SLAB_LIBS="$SLAB_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libslab\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libslab") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_SLAB_LIBS=`$PKG_CONFIG --libs "libslab" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ SLAB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libslab"` -+ else -+ SLAB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libslab"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$SLAB_PKG_ERRORS" >&5 -+ -+ { { echo "$as_me:$LINENO: error: Package requirements (libslab) were not met: -+ -+$SLAB_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables SLAB_CFLAGS -+and SLAB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+echo "$as_me: error: Package requirements (libslab) were not met: -+ -+$SLAB_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables SLAB_CFLAGS -+and SLAB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables SLAB_CFLAGS -+and SLAB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables SLAB_CFLAGS -+and SLAB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+else -+ SLAB_CFLAGS=$pkg_cv_SLAB_CFLAGS -+ SLAB_LIBS=$pkg_cv_SLAB_LIBS -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ : -+fi -+ -+pkg_failed=no - { echo "$as_me:$LINENO: checking for TYPING" >&5 - echo $ECHO_N "checking for TYPING... $ECHO_C" >&6; } - -@@ -29681,7 +29668,7 @@ - - - --ac_config_files="$ac_config_files Makefile capplets/Makefile capplets/about-me/Makefile capplets/about-me/gnome-about-me.desktop.in capplets/accessibility/Makefile capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/accessibility/keyboard/Makefile capplets/accessibility/keyboard/accessibility-keyboard.desktop.in capplets/appearance/Makefile capplets/appearance/data/Makefile capplets/appearance/data/gnome-appearance-properties.desktop.in capplets/appearance/data/gnome-theme-installer.desktop.in capplets/common/Makefile capplets/default-applications/Makefile capplets/default-applications/default-applications.desktop.in capplets/default-applications/gnome-at-commandline.in capplets/default-applications/gnome-at-session.desktop.in capplets/display/Makefile capplets/display/display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/gnome-keybindings.pc capplets/keybindings/keybinding.desktop.in capplets/keyboard/Makefile capplets/keyboard/keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/gnome-settings-mouse.desktop.in capplets/network/Makefile capplets/network/gnome-network-preferences.desktop.in capplets/sound/Makefile capplets/sound/gnome-settings-sound.desktop.in capplets/windows/Makefile capplets/windows/window-properties.desktop.in gnome-settings-daemon/Makefile gnome-settings-daemon/actions/Makefile gnome-settings-daemon/gnome-settings-daemon.pc gnome-settings-daemon/xrdb/Makefile help/Makefile libbackground/Makefile libslab/Makefile libslab/libslab.pc libsounds/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in schemas/Makefile shell/Makefile shell/gnomecc.desktop.in typing-break/Makefile vfs-methods/Makefile vfs-methods/fontilus/Makefile vfs-methods/fontilus/gnome-font-viewer.desktop.in vfs-methods/themus/Makefile vfs-methods/themus/themus-theme-applier.desktop.in" -+ac_config_files="$ac_config_files Makefile capplets/Makefile capplets/about-me/Makefile capplets/about-me/gnome-about-me.desktop.in capplets/accessibility/Makefile capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/accessibility/keyboard/Makefile capplets/accessibility/keyboard/accessibility-keyboard.desktop.in capplets/appearance/Makefile capplets/appearance/data/Makefile capplets/appearance/data/gnome-appearance-properties.desktop.in capplets/appearance/data/gnome-theme-installer.desktop.in capplets/common/Makefile capplets/default-applications/Makefile capplets/default-applications/default-applications.desktop.in capplets/default-applications/gnome-at-commandline.in capplets/default-applications/gnome-at-session.desktop.in capplets/display/Makefile capplets/display/display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/gnome-keybindings.pc capplets/keybindings/keybinding.desktop.in capplets/keyboard/Makefile capplets/keyboard/keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/gnome-settings-mouse.desktop.in capplets/network/Makefile capplets/network/gnome-network-preferences.desktop.in capplets/sound/Makefile capplets/sound/gnome-settings-sound.desktop.in capplets/windows/Makefile capplets/windows/window-properties.desktop.in gnome-settings-daemon/Makefile gnome-settings-daemon/actions/Makefile gnome-settings-daemon/gnome-settings-daemon.pc gnome-settings-daemon/xrdb/Makefile help/Makefile libbackground/Makefile libsounds/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in schemas/Makefile shell/Makefile shell/gnomecc.desktop.in typing-break/Makefile vfs-methods/Makefile vfs-methods/fontilus/Makefile vfs-methods/fontilus/gnome-font-viewer.desktop.in vfs-methods/themus/Makefile vfs-methods/themus/themus-theme-applier.desktop.in" - - - cat >confcache <<\_ACEOF -@@ -29833,13 +29820,6 @@ - ac_config_commands="$ac_config_commands po/stamp-it" - - --if test -z "${ENABLE_DYNAMIC_LIBSLAB_TRUE}" && test -z "${ENABLE_DYNAMIC_LIBSLAB_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DYNAMIC_LIBSLAB\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"ENABLE_DYNAMIC_LIBSLAB\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi - if test -z "${HAVE_XINPUT_TRUE}" && test -z "${HAVE_XINPUT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_XINPUT\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -30424,8 +30404,6 @@ - "gnome-settings-daemon/xrdb/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-settings-daemon/xrdb/Makefile" ;; - "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; - "libbackground/Makefile") CONFIG_FILES="$CONFIG_FILES libbackground/Makefile" ;; -- "libslab/Makefile") CONFIG_FILES="$CONFIG_FILES libslab/Makefile" ;; -- "libslab/libslab.pc") CONFIG_FILES="$CONFIG_FILES libslab/libslab.pc" ;; - "libsounds/Makefile") CONFIG_FILES="$CONFIG_FILES libsounds/Makefile" ;; - "libwindow-settings/Makefile") CONFIG_FILES="$CONFIG_FILES libwindow-settings/Makefile" ;; - "libwindow-settings/gnome-window-settings-2.0.pc") CONFIG_FILES="$CONFIG_FILES libwindow-settings/gnome-window-settings-2.0.pc" ;; -@@ -30709,10 +30687,6 @@ - TYPING_BREAK!$TYPING_BREAK$ac_delim - SCREENSAVER_LIBS!$SCREENSAVER_LIBS$ac_delim - XF86MISC_LIBS!$XF86MISC_LIBS$ac_delim --ENABLE_DYNAMIC_LIBSLAB_TRUE!$ENABLE_DYNAMIC_LIBSLAB_TRUE$ac_delim --ENABLE_DYNAMIC_LIBSLAB_FALSE!$ENABLE_DYNAMIC_LIBSLAB_FALSE$ac_delim --LIBSLAB_CFLAGS!$LIBSLAB_CFLAGS$ac_delim --LIBSLAB_LIBS!$LIBSLAB_LIBS$ac_delim - CAPPLET_CFLAGS!$CAPPLET_CFLAGS$ac_delim - CAPPLET_LIBS!$CAPPLET_LIBS$ac_delim - GNOMECC_CFLAGS!$GNOMECC_CFLAGS$ac_delim -@@ -30735,8 +30709,12 @@ - DEFAULT_APPLICATIONS_CAPPLET_LIBS!$DEFAULT_APPLICATIONS_CAPPLET_LIBS$ac_delim - METACITY_CFLAGS!$METACITY_CFLAGS$ac_delim - METACITY_LIBS!$METACITY_LIBS$ac_delim -+SLAB_CFLAGS!$SLAB_CFLAGS$ac_delim -+SLAB_LIBS!$SLAB_LIBS$ac_delim - TYPING_CFLAGS!$TYPING_CFLAGS$ac_delim - TYPING_LIBS!$TYPING_LIBS$ac_delim -+HAVE_XINPUT_TRUE!$HAVE_XINPUT_TRUE$ac_delim -+HAVE_XINPUT_FALSE!$HAVE_XINPUT_FALSE$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -30778,8 +30756,6 @@ - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF --HAVE_XINPUT_TRUE!$HAVE_XINPUT_TRUE$ac_delim --HAVE_XINPUT_FALSE!$HAVE_XINPUT_FALSE$ac_delim - FONT_CAPPLET_CFLAGS!$FONT_CAPPLET_CFLAGS$ac_delim - FONT_CAPPLET_LIBS!$FONT_CAPPLET_LIBS$ac_delim - AT_CAPPLET_CFLAGS!$AT_CAPPLET_CFLAGS$ac_delim -@@ -30856,7 +30832,7 @@ - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -diff -Naur control-center-2.20.3.old/gnome-settings-daemon/actions/Makefile.in control-center-2.20.3/gnome-settings-daemon/actions/Makefile.in ---- control-center-2.20.3.old/gnome-settings-daemon/actions/Makefile.in 2008-01-08 14:28:17.000000000 +0100 -+++ control-center-2.20.3/gnome-settings-daemon/actions/Makefile.in 2008-01-12 07:40:39.000000000 +0100 -@@ -224,8 +224,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -259,6 +257,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/gnome-settings-daemon/Makefile.in control-center-2.20.3/gnome-settings-daemon/Makefile.in ---- control-center-2.20.3.old/gnome-settings-daemon/Makefile.in 2008-01-08 14:28:17.000000000 +0100 -+++ control-center-2.20.3/gnome-settings-daemon/Makefile.in 2008-01-12 07:40:39.000000000 +0100 -@@ -258,8 +258,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -293,6 +291,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/gnome-settings-daemon/xrdb/Makefile.in control-center-2.20.3/gnome-settings-daemon/xrdb/Makefile.in ---- control-center-2.20.3.old/gnome-settings-daemon/xrdb/Makefile.in 2008-01-08 14:28:17.000000000 +0100 -+++ control-center-2.20.3/gnome-settings-daemon/xrdb/Makefile.in 2008-01-12 07:40:40.000000000 +0100 -@@ -182,8 +182,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -217,6 +215,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/help/Makefile.in control-center-2.20.3/help/Makefile.in ---- control-center-2.20.3.old/help/Makefile.in 2008-01-08 14:28:17.000000000 +0100 -+++ control-center-2.20.3/help/Makefile.in 2008-01-12 07:40:40.000000000 +0100 -@@ -197,8 +197,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -232,6 +230,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/libbackground/Makefile.in control-center-2.20.3/libbackground/Makefile.in ---- control-center-2.20.3.old/libbackground/Makefile.in 2008-01-08 14:28:17.000000000 +0100 -+++ control-center-2.20.3/libbackground/Makefile.in 2008-01-12 07:40:40.000000000 +0100 -@@ -191,8 +191,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -226,6 +224,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/libsounds/Makefile.in control-center-2.20.3/libsounds/Makefile.in ---- control-center-2.20.3.old/libsounds/Makefile.in 2008-01-08 14:28:18.000000000 +0100 -+++ control-center-2.20.3/libsounds/Makefile.in 2008-01-12 07:40:41.000000000 +0100 -@@ -195,8 +195,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -230,6 +228,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/libwindow-settings/Makefile.in control-center-2.20.3/libwindow-settings/Makefile.in ---- control-center-2.20.3.old/libwindow-settings/Makefile.in 2008-01-12 07:39:20.000000000 +0100 -+++ control-center-2.20.3/libwindow-settings/Makefile.in 2008-01-12 07:40:41.000000000 +0100 -@@ -226,8 +226,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -261,6 +259,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/ltmain.sh control-center-2.20.3/ltmain.sh ---- control-center-2.20.3.old/ltmain.sh 2007-12-13 08:50:12.000000000 +0100 -+++ control-center-2.20.3/ltmain.sh 2007-11-27 22:23:09.000000000 +0100 -@@ -43,7 +43,7 @@ - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION="1.5.24 Debian 1.5.24-2ubuntu1" -+VERSION="1.5.24 Debian 1.5.24-2" - TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" - - # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -diff -Naur control-center-2.20.3.old/Makefile.in control-center-2.20.3/Makefile.in ---- control-center-2.20.3.old/Makefile.in 2008-01-08 14:28:19.000000000 +0100 -+++ control-center-2.20.3/Makefile.in 2008-01-12 07:40:44.000000000 +0100 -@@ -200,8 +200,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -235,6 +233,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -@@ -316,7 +316,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods schemas $(TYPING_BREAK) -+SUBDIRS = po libsounds libbackground libwindow-settings gnome-settings-daemon capplets shell help vfs-methods schemas $(TYPING_BREAK) - DISTCLEANFILES = \ - gnome-doc-utils.make \ - intltool-extract \ -diff -Naur control-center-2.20.3.old/schemas/Makefile.in control-center-2.20.3/schemas/Makefile.in ---- control-center-2.20.3.old/schemas/Makefile.in 2008-01-08 14:28:18.000000000 +0100 -+++ control-center-2.20.3/schemas/Makefile.in 2008-01-12 07:40:41.000000000 +0100 -@@ -182,8 +182,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -217,6 +215,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/shell/Makefile.in control-center-2.20.3/shell/Makefile.in ---- control-center-2.20.3.old/shell/Makefile.in 2008-01-08 14:28:18.000000000 +0100 -+++ control-center-2.20.3/shell/Makefile.in 2008-01-12 07:40:42.000000000 +0100 -@@ -54,7 +54,7 @@ - gnome_control_center_OBJECTS = $(am_gnome_control_center_OBJECTS) - am__DEPENDENCIES_1 = - gnome_control_center_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(top_builddir)/libslab/libslab.la -+ $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -211,8 +211,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -246,6 +244,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -@@ -328,7 +328,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = \ -- -I$(top_srcdir)/libslab \ -+ $(SLAB_CFLAGS) \ - $(GNOMECC_CFLAGS) - - gnome_control_center_SOURCES = \ -@@ -336,7 +336,7 @@ - - gnome_control_center_LDADD = \ - $(GNOMECC_LIBS) \ -- $(top_builddir)/libslab/libslab.la -+ $(SLAB_LIBS) - - AM_CPPFLAGS = \ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" -diff -Naur control-center-2.20.3.old/typing-break/Makefile.in control-center-2.20.3/typing-break/Makefile.in ---- control-center-2.20.3.old/typing-break/Makefile.in 2008-01-08 14:28:18.000000000 +0100 -+++ control-center-2.20.3/typing-break/Makefile.in 2008-01-12 07:40:42.000000000 +0100 -@@ -217,8 +217,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -252,6 +250,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/vfs-methods/fontilus/Makefile.in control-center-2.20.3/vfs-methods/fontilus/Makefile.in ---- control-center-2.20.3.old/vfs-methods/fontilus/Makefile.in 2008-01-08 14:28:18.000000000 +0100 -+++ control-center-2.20.3/vfs-methods/fontilus/Makefile.in 2008-01-12 07:40:43.000000000 +0100 -@@ -239,8 +239,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -274,6 +272,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/vfs-methods/Makefile.in control-center-2.20.3/vfs-methods/Makefile.in ---- control-center-2.20.3.old/vfs-methods/Makefile.in 2008-01-08 14:28:18.000000000 +0100 -+++ control-center-2.20.3/vfs-methods/Makefile.in 2008-01-12 07:40:42.000000000 +0100 -@@ -184,8 +184,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -219,6 +217,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ -diff -Naur control-center-2.20.3.old/vfs-methods/themus/Makefile.in control-center-2.20.3/vfs-methods/themus/Makefile.in ---- control-center-2.20.3.old/vfs-methods/themus/Makefile.in 2008-01-08 14:28:19.000000000 +0100 -+++ control-center-2.20.3/vfs-methods/themus/Makefile.in 2008-01-12 07:40:43.000000000 +0100 -@@ -250,8 +250,6 @@ - LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@ --LIBSLAB_LIBS = @LIBSLAB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -285,6 +283,8 @@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -+SLAB_CFLAGS = @SLAB_CFLAGS@ -+SLAB_LIBS = @SLAB_LIBS@ - SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@ - SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@ - STRIP = @STRIP@ diff -ruN control-center-2.20.3.orig/gnome-settings-daemon/gnome-settings-keyboard.c control-center-2.20.3/gnome-settings-daemon/gnome-settings-keyboard.c --- control-center-2.20.3.orig/gnome-settings-daemon/gnome-settings-keyboard.c 2008-01-08 14:18:35.000000000 +0100 +++ control-center-2.20.3/gnome-settings-daemon/gnome-settings-keyboard.c 2008-01-25 10:35:09.000000000 +0100 @@ -379,8 +379,10 @@ gnome_settings_module_keyboard_initialize (GnomeSettingsModule *module, GConfClient *client) { /* Essential - xkb initialization should happen before */ +#if 0 gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gnome_settings_load_modmap_files, NULL); gnome_settings_keyboard_xkb_init (client); +#endif gnome_settings_register_config_callback (GSD_KEYBOARD_KEY, (GnomeSettingsConfigCallback) apply_settings); #ifdef HAVE_X11_EXTENSIONS_XKB_H @@ -394,8 +396,9 @@ gnome_settings_module_keyboard_start (GnomeSettingsModule *module) { /* Essential - xkb initialization should happen before */ +#if 0 gnome_settings_keyboard_xkb_load (gnome_settings_module_get_config_client (module)); - +#endif apply_settings (); return TRUE; diff -ruN control-center-2.20.3.orig/gnome-settings-daemon/Makefile.am control-center-2.20.3/gnome-settings-daemon/Makefile.am --- control-center-2.20.3.orig/gnome-settings-daemon/Makefile.am 2008-01-08 14:18:35.000000000 +0100 +++ control-center-2.20.3/gnome-settings-daemon/Makefile.am 2008-01-24 16:48:56.000000000 +0100 @@ -31,8 +31,6 @@ gnome-settings-font.c \ gnome-settings-gtk1theme.c \ gnome-settings-keybindings.c \ - gnome-settings-keyboard-xkb.h \ - gnome-settings-keyboard-xkb.c \ gnome-settings-keyboard.c \ gnome-settings-locate-pointer.c \ gnome-settings-locate-pointer.h \ diff -ruN control-center-2.20.3.orig/libwindow-settings/Makefile.am control-center-2.20.3/libwindow-settings/Makefile.am --- control-center-2.20.3.orig/libwindow-settings/Makefile.am 2008-01-08 14:18:26.000000000 +0100 +++ control-center-2.20.3/libwindow-settings/Makefile.am 2008-01-25 11:01:57.000000000 +0100 @@ -1,4 +1,4 @@ -WM_MODULE_DIR=$(libdir)/window-manager-settings +WM_MODULE_DIR=$(libdir)/libgnome-window-settings1 INCLUDES = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ diff -ruN control-center-2.20.3.orig/Makefile.am control-center-2.20.3/Makefile.am --- control-center-2.20.3.orig/Makefile.am 2008-01-08 14:19:33.000000000 +0100 +++ control-center-2.20.3/Makefile.am 2008-01-25 14:33:18.000000000 +0100 @@ -3,14 +3,12 @@ ACLOCAL_AMFLAGS = -I m4 DISTCLEANFILES = \ - gnome-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update EXTRA_DIST = \ MAINTAINERS \ - gnome-doc-utils.make \ intltool-extract.in \ intltool-merge.in \ intltool-update.in diff -ruN control-center-2.20.3.orig/vfs-methods/themus/Makefile.am control-center-2.20.3/vfs-methods/themus/Makefile.am --- control-center-2.20.3.orig/vfs-methods/themus/Makefile.am 2008-01-08 14:18:27.000000000 +0100 +++ control-center-2.20.3/vfs-methods/themus/Makefile.am 2008-01-25 10:23:46.000000000 +0100 @@ -75,7 +75,6 @@ update-desktop-database $(DESTDIR)$(desktopdir) distclean-local: - rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_SCHEMAS_RULE@