--- configure.old	2010-09-10 05:04:46.000000000 -0400
+++ configure	2010-09-28 00:52:09.000000000 -0400
@@ -2351,11 +2351,6 @@
         fi
     done
 
-    # symlink the mkspecs directory
-    mkdir -p "$outpath/mkspecs"
-    rm -rf "$outpath"/mkspecs/*
-    ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
-    rm -f "$outpath/mkspecs/default"
 
     # Special case for mkspecs/features directory.
     # To be able to place .prf files into a shadow build directory,
@@ -2394,7 +2389,7 @@
 # find a make command
 if [ -z "$MAKE" ]; then
     MAKE=
-    for mk in gmake make; do
+    for mk in make; do
         if "$WHICH" $mk >/dev/null 2>&1; then
             MAKE=`"$WHICH" $mk`
             break
@@ -4466,7 +4461,7 @@
 }
 
 # build qmake
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
     echo "Creating qmake. Please wait..."
 
     OLD_QCONFIG_H=
@@ -5391,14 +5386,6 @@
         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
     fi
 
-    # Check we actually have X11 :-)
-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
-    if [ $? != "0" ]; then
-        echo "Basic XLib functionality test failed!"
-        echo " You might need to modify the include and library search paths by editing"
-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-        exit 1
-    fi
 fi
 
 # X11/MINGW OpenGL