diff options
author | Michael-Luke Jones <mlj28@cam.ac.uk> | 2006-09-23 15:44:37 +0000 |
---|---|---|
committer | Michael-Luke Jones <mlj28@cam.ac.uk> | 2006-09-23 15:44:37 +0000 |
commit | 81871146fc44e7bfb8994d72179f1d2b18234f46 (patch) | |
tree | 56554958dd9cab600b6df0962a2d0f6214b5498f /packages/xorg-xserver/xserver-kdrive_git.bb | |
parent | b0b86b00cd0958f9b320546de9171f127a7f17d6 (diff) | |
parent | 7800aa9b73b83aa07a4a10a6fda5d38c7b7a0bbe (diff) |
merge of '4ed867356aa513df5383618b7b7dbfe95e1a60f3'
and '61fe964a3f1677ae14fdaf18662f4d14b4613bb1'
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive_git.bb')
-rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 27632f628c..198556c58d 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -62,19 +62,10 @@ EXTRA_OECONF = "--enable-composite --enable-sdl --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx --enable-w100 \ + --disable-dmx \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -# w100 doesn't build for x86 -EXTRA_OECONF_x86 = "--enable-composite --enable-sdl --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx --disable-w100 \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" +EXTRA_OECONF_append_arm = " --enable-w100" +EXTRA_OECONF_append_x86 = " --disable-w100" |