Merge branch '1.0'

Conflicts:
	configure.bat
	doc/html/lightmaps.html

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 6c714d6289..5af1c6aeaf 100755
--- a/configure
+++ b/configure
@@ -456,7 +456,7 @@ compileTest()
     printf "."
     "$MAKE" >> "$CONFIG_LOG" 2>&1
     printf ". "
-    if ./$2 >> "$CONFIG_LOG" 2>&1; then
+    if [ -e ./$2 ]; then
         echo "OK"
         echo "$2_enabled = yes" >> "$CONFIG_IN"
     else