summaryrefslogtreecommitdiff
path: root/package/x11r7
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-04-24 13:22:14 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-04-24 13:22:14 +0000
commit2d1edaa4858eb47e0b93ea2cb118ce8305082880 (patch)
treee1bdaba8973bbeeb644e61574a16d0b2c9348450 /package/x11r7
parentd74dfa37fcaa492fa01e3e966323118382c74ede (diff)
some fixes for X
Diffstat (limited to 'package/x11r7')
-rw-r--r--package/x11r7/xapp_xclock/xapp_xclock.mk2
-rw-r--r--package/x11r7/xkeyboard-config/xkeyboard-config.mk2
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk6
3 files changed, 9 insertions, 1 deletions
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 56b22fca6..47b57a52b 100644
--- 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 2fb67fd5e..209b6c543 100644
--- 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 fbddfc568..a85b152da 100644
--- 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))