ensure that no license queries are made in -redo mode

implement it in configure.exe and fix it in configure.sh.

Change-Id: I30764f4cba4bad0f23bfb40ce7a2ca614e1afd71
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 18 insertions, 4 deletions

diff --git a/configure b/configure
index 8be7b5fa44..dab15b10cf 100755
--- a/configure
+++ b/configure
@@ -1045,9 +1045,13 @@ if [ "$COMMERCIAL_USER" = "ask" ]; then
         echo
         if [ "$commercial" = "c" ]; then
             COMMERCIAL_USER="yes"
+            OPT_CMDLINE="$OPT_CMDLINE
+-commercial"
             break
         elif [ "$commercial" = "o" ]; then
             COMMERCIAL_USER="no"
+            OPT_CMDLINE="$OPT_CMDLINE
+-opensource"
             break
         fi
     done
@@ -1935,8 +1939,10 @@ fi
 # finally save the executed command to another script
 #-------------------------------------------------------------------------------
 if [ $CFG_REDO = no ]; then
-    echo "$OPT_CMDLINE" | grep '\-confirm\-license' >/dev/null 2>&1 || OPT_CMDLINE="$OPT_CMDLINE
+    if [ "$OPT_CONFIRM_LICENSE" = "no" ]; then
+        OPT_CMDLINE="$OPT_CMDLINE
 -confirm-license"
+    fi
 
     # skip first line, as it's always empty due to unconditional field separation
     echo "$OPT_CMDLINE" | tail -n +2 > config.opt
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 24f89318fa..cc46fb99cb 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -532,9 +532,6 @@ void Configure::parseCmdLine()
             cout << "Invalid option \"" << dictionary["XQMAKESPEC"] << "\" for -xplatform." << endl;
         }
     }
-
-    if ((dictionary["REDO"] != "yes") && (dictionary["DONE"] != "error"))
-        saveCmdLine();
 }
 
 /*!
@@ -1026,6 +1023,9 @@ void Configure::configure()
         cout << "Qmake failed, return code " << exitCode  << endl << endl;
         dictionary[ "DONE" ] = "error";
     }
+
+    if ((dictionary["REDO"] != "yes") && (dictionary["DONE"] != "error"))
+        saveCmdLine();
 }
 
 void Configure::generateMakefiles()
@@ -1093,6 +1093,7 @@ bool Configure::showLicense(QString orgLicenseFile)
         accept = tolower(accept);
 
         if (accept == 'y') {
+            configCmdLine << "-confirm-license";
             return true;
         } else if (accept == 'n') {
             return false;
@@ -1172,10 +1173,17 @@ void Configure::readLicense()
     } else if (openSource) {
         cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl;
         dictionary["DONE"] = "error";
+        return;
     }
     else {
         Tools::checkLicense(dictionary, sourcePath, buildPath);
     }
+    if (dictionary["BUILDTYPE"] == "none") {
+        if (openSource)
+            configCmdLine << "-opensource";
+        else
+            configCmdLine << "-commercial";
+    }
 }
 
 bool Configure::reloadCmdLine(int idx)