some fixes for X

diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 56b22fca67ef9fabe6d7c8f08d6f5bac16e6f277..47b57a52baf2f8f46dacb249f119908c4c922066 100644 (file)
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -10,4 +10,6 @@ XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLOCK_AUTORECONF = NO
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
 
+XAPP_XCLOCK_CONF_OPT = LDFLAGS="-liconv"
+
 $(eval $(call AUTOTARGETS,package/x11r7,xapp_xclock))

diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 2fb67fd5e62bad042c0cec1072abb3ca7d53d363..209b6c543ed38a76d28341f7878b0d0ec344b549 100644 (file)
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -11,7 +11,7 @@ XKEYBOARD_CONFIG_INSTALL_STAGING = NO
 XKEYBOARD_CONFIG_INSTALL_TARGET = YES
 XKEYBOARD_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-XKEYBOARD_CONFIG_CONF_OPT = 
+XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 
 XKEYBOARD_CONFIG_DEPENDENCIES = uclibc 
 

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index fbddfc568ae4c3b25afcf6cf0392d71f2698b425..a85b152dab062f8340ec3c2e9d024e5e67216b96 100644 (file)
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -28,4 +28,10 @@ XSERVER_XORG_SERVER_CONF_OPT = --enable-kdrive --enable-xfbdev --enable-freetype
 
 XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
+# Optional packages
+ifeq ($(strip $(BR2_PACKAGE_TSLIB)),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += tslib
+XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts"
+endif
+
 $(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))