[Scummvm-cvs-logs] scummvm master -> d2f598cea677fc03b5987fb9f9d9ac41faa96ded

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d2f598cea6 CONFIGURE: Only open config.log after showing help


Commit: d2f598cea677fc03b5987fb9f9d9ac41faa96ded
    https://github.com/scummvm/scummvm/commit/d2f598cea677fc03b5987fb9f9d9ac41faa96ded
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-06-27T22:19:02+02:00

Commit Message:
CONFIGURE: Only open config.log after showing help

This prevents ./configure --help from clearing config.log.

Changed paths:
    configure



diff --git a/configure b/configure
index 8b8894d..9e2a19d 100755
--- a/configure
+++ b/configure
@@ -809,18 +809,6 @@ get_subengines_build_string() {
 }
 
 #
-# Greet user
-#
-echo "Running ScummVM configure..."
-echo "Configure run on" `date` > $TMPLOG
-cat >> $TMPLOG <<EOF
-Invocation command line was:
-$0 $@
-Saved environment variables:
-LDFLAGS="$SAVED_LDFLAGS" CXX="$SAVED_CXX" CXXFLAGS="$SAVED_CXXFLAGS" CPPFLAGS="$SAVED_CPPFLAGS" ASFLAGS="$SAVED_ASFLAGS" WINDRESFLAGS="$SAVED_WINDRESFLAGS" SDL_CONFIG="$SAVED_SDL_CONFIG"
-EOF
-
-#
 # Check any parameters we received
 #
 # TODO:
@@ -1031,6 +1019,20 @@ EOF
 	fi
 done # for parm in ...
 
+
+#
+# If we're not showing help, greet the user and start the log file
+#
+echo "Running ScummVM configure..."
+echo "Configure run on" `date` > $TMPLOG
+cat >> $TMPLOG <<EOF
+Invocation command line was:
+$0 $@
+Saved environment variables:
+LDFLAGS="$SAVED_LDFLAGS" CXX="$SAVED_CXX" CXXFLAGS="$SAVED_CXXFLAGS" CPPFLAGS="$SAVED_CPPFLAGS" ASFLAGS="$SAVED_ASFLAGS" WINDRESFLAGS="$SAVED_WINDRESFLAGS" SDL_CONFIG="$SAVED_SDL_CONFIG"
+EOF
+
+
 for ac_option in $@; do
 	case "$ac_option" in
 	--disable-16bit)          _16bit=no       ;;