Merge branch 'matchbox-fix' of git://git.busybox.net/~tpetazzoni/git/buildroot

package/matchbox/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MATCHBOX
 	bool "MatchBox Window Manager"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE
 	select BR2_PACKAGE_XLIB_LIBXCURSOR

package/matchbox/matchbox.mk

@@ -160,6 +160,8 @@ MATCHBOX_WM_OPTS:=
 MATCHBOX_WM_DEPS:=xlib_libXdamage
 MATCHBOX_WM_DEPS+=xlib_libXcursor
 
+MATCHBOX_KB_DEPS:=
+
 ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
 ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
   MATCHBOX_WM_OPTS+=--enable-composite
@@ -199,8 +201,10 @@ endif
 ifeq ($(BR2_PACKAGE_PANGO),y)
   MATCHBOX_LIB_OPTS+=--enable-pango
   MATCHBOX_LIB_DEPS+=pango
+  MATCHBOX_KB_OPTS+=--enable-pango
 else
   MATCHBOX_LIB_OPTS+=--disable-pango
+  MATCHBOX_KB_DEPS+=xlib_libXft
 endif
 
 ifeq ($(BR2_PACKAGE_X11R7_LIBXFT2),y)
@@ -424,6 +428,7 @@ $(MATCHBOX_KB_DIR)/.configured: $(MATCHBOX_KB_DIR)/.unpacked
 	--with-x \
 	--x-includes=$(STAGING_DIR)/usr/include/X11 \
 	--x-libraries=$(STAGING_DIR)/usr/lib \
+	$(MATCHBOX_KB_OPTS) \
 	)
 	touch $(MATCHBOX_KB_DIR)/.configured
 
@@ -610,7 +615,7 @@ matchbox-panel: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGE
 
 matchbox-desktop: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN)
 
-matchbox-keyboard: uclibc matchbox xlib_libXtst $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN)
+matchbox-keyboard: uclibc matchbox xlib_libXtst $(MATCHBOX_KB_DEPS) $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN)
 
 matchbox-clean:
 	rm -f $(TARGET_DIR)/usr/lib/libmb.*

package/x11r7/xlib_libXfont/xlib_libXfont.mk

@@ -7,7 +7,7 @@
 XLIB_LIBXFONT_VERSION = 1.3.3
 XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXFONT_AUTORECONF = NO
+XLIB_LIBXFONT_AUTORECONF = YES
 XLIB_LIBXFONT_INSTALL_STAGING = YES
 XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
 XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static

package/x11r7/xlib_libXft/xlib_libXft.mk

@@ -7,7 +7,7 @@
 XLIB_LIBXFT_VERSION = 2.1.13
 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXFT_AUTORECONF = NO
+XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static