--- configure.orig	2014-04-10 18:37:08.000000000 +0000
+++ configure
@@ -916,7 +916,7 @@ OPT_HELP=
 CFG_SILENT=no
 CFG_GRAPHICS_SYSTEM=default
 CFG_RUNTIME_SYSTEM=
-CFG_ALSA=auto
+CFG_ALSA=no
 CFG_PULSEAUDIO=auto
 CFG_COREWLAN=auto
 CFG_ICD=auto
@@ -2704,11 +2704,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
         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"
 
     ShadowMkspecs()
     {
@@ -3019,6 +3014,7 @@ else
     PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
 fi
 
+PLATFORM=`realpath $PLATFORM`
 [ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM"
 
 case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
@@ -4915,7 +4911,7 @@ setBootstrapVariable()
 }
 
 # build qmake
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
     echo "Creating qmake. Please wait..."
 
     OLD_QCONFIG_H=
@@ -6041,14 +6037,6 @@ if [ "$PLATFORM_X11" = "yes" -a "$CFG_GU
         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
     fi
 
-    # Check we actually have X11 :-)
-    compileTest x11/xlib "XLib" $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/SYMBIAN OpenGL