1 files changed, 6 insertions, 3 deletions

diff --git a/config.in.in b/config.in.in
index 41998d4..7af1f17 100644
--- a/config.in.in
+++ b/config.in.in
@@ -15,45 +15,48 @@ menu "Build Parameters"
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   config TARGET_SHARP
     boolean "Sharp Zaurus SL-5x00 - stock"
 
 #  config TARGET_OZ
 #    boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
 
   config TARGET_IPAQ
     boolean "Ipaq"
 
 endchoice
 
 config SPECFILE
   string
-  default "linux-generic-g++" if TARGET_X86
-  default "linux-sharp-g++" if TARGET_SHARP
+  default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
+  default "linux-g++" if TARGET_X86 && X11
+  default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
+  default "linux-g++" if TARGET_SHARP && X11
 #  default "linux-oz-g++" if TARGET_OZ
-  default "linux-ipaq-g++" if TARGET_IPAQ
+  default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
+  default "linux-g++" if TARGET_IPAQ && X11
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   
 #config CROSS
 #  string "Crosscompilation prefix"
 #  default "arm-linux-"
 #  help
 #    Crosscompilation prefix is the prefix which will be prepended
 #    to all compilation commands. For example, a crosscompilation prefix
 #    of arm-linux-, results in the build calling arm-linux-gcc as its CC.
 
 endmenu
 
 @sources@