From 54c8c7a96a9303e7a56ca3cef8dcb1e91f23f2ac Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 25 Oct 2013 20:08:35 +0200
Subject: duplicate less work while handling -qconfig

Change-Id: I8ba6b866f98c9fe7609af71c168023097e32828c
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 configure | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index d74d811546..f8dcebe9f6 100755
--- a/configure
+++ b/configure
@@ -2389,6 +2389,7 @@ while [ "$#" -gt 0 ]; do
 done
 
 # update QT_CONFIG to show our current predefined configuration
+CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
 case "$CFG_QCONFIG" in
 minimal|small|medium|large|full)
     # these are a sequence of increasing functionality
@@ -2396,15 +2397,19 @@ minimal|small|medium|large|full)
         QT_CONFIG="$QT_CONFIG $c-config"
         [ "$CFG_QCONFIG" = $c ] && break
     done
+    [ "$CFG_QCONFIG" = full ] && CFG_QCONFIG_PATH=
     ;;
 *)
     # not known to be sufficient for anything
-    if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ] && [ '!' -f `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` ]; then
-        echo >&2 "Error: configuration file not found:"
-        echo >&2 "  $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
-        echo >&2 "  or"
-        echo >&2 "  `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"`"
-        OPT_HELP=yes
+    if [ ! -f "$CFG_QCONFIG_PATH" ]; then
+        CFG_QCONFIG_PATH=`"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"`
+        if [ ! -f "$CFG_QCONFIG_PATH" ]; then
+            echo >&2 "Error: configuration file not found:"
+            echo >&2 "  $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
+            echo >&2 "  or"
+            echo >&2 "  $CFG_QCONFIG_PATH"
+            OPT_HELP=yes
+        fi
     fi
 esac
 
@@ -6319,11 +6324,7 @@ full)
 *)
     tmpconfig="$outpath/src/corelib/global/qconfig.h.new"
     echo "#ifndef QT_BOOTSTRAPPED" >"$tmpconfig"
-    if [ -f "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" ]; then
-        cat "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" >>"$tmpconfig"
-    elif [ -f `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` ]; then
-        cat `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` >>"$tmpconfig"
-    fi
+    cat "$CFG_QCONFIG_PATH" >>"$tmpconfig"
     echo "#endif" >>"$tmpconfig"
     ;;
 esac
-- 
cgit v1.2.3