From e9d539623aa97b307a0d5d7cd10dbdf392e9b92f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 18 Jun 2013 15:11:11 +0200
Subject: introduce "secret" configure -top-level option

shifts the makefile generation one directory level up.
this allows the top-level configure to leave the makefile creation
entirely to the qtbase configure.
this is not very clean modularization-wise, but consistent with -skip.

Change-Id: I7ee2d2f29f2e6619d61fe9b55faa0bacdf3c44c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 configure | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 13e6fd016a..58c1eb2ce5 100755
--- a/configure
+++ b/configure
@@ -61,6 +61,13 @@ if [ -f "$LICENSE_FILE" ]; then
     diff "${LICENSE_FILE}.tmp" "${LICENSE_FILE}" >/dev/null 2>&1 || LICENSE_FILE="${LICENSE_FILE}.tmp"
 fi
 
+# do this early so we don't store it in config.status
+CFG_TOPLEVEL=
+if [ x"$1" = x"-top-level" ]; then
+    CFG_TOPLEVEL=yes
+    shift
+fi
+
 # later cache the command line in config.status
 OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
 
@@ -6910,14 +6917,23 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
 #-------------------------------------------------------------------------------
 
 if [ "$CFG_PROCESS" != "no" ]; then
+(   # fork to make the cd stay local
+
+    relpathMangled=$relpath
+    if [ -n "$CFG_TOPLEVEL" ]; then
+        relpathMangled=`dirname "$relpath"`
+        cd ..
+    fi
 
     if [ "$CFG_PROCESS" = "full" ]; then
         echo "Creating makefiles. Please wait..."
-        "$outpath/bin/qmake" -r "$relpath"
+        "$outpath/bin/qmake" -r "$relpathMangled"
         echo "Done"
     else
-        "$outpath/bin/qmake" "$relpath"
+        "$outpath/bin/qmake" "$relpathMangled"
     fi
+
+)
 fi
 
 #-------------------------------------------------------------------------------
-- 
cgit v1.2.3


From f30a905ea46edbb6303476aa1119686c490f6428 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@digia.com>
Date: Tue, 25 Jun 2013 16:05:31 +0200
Subject: configure: Don't use 'local' in report_support()

The 'local' keyword doesn't exist in Solaris' bourne shell as a
reserved word.

Change-Id: I3270c74f79842ee10481a40a9f82d9fb74aff2e5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 configure | 2 --
 1 file changed, 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 58c1eb2ce5..7cdb4af8a6 100755
--- a/configure
+++ b/configure
@@ -6703,11 +6703,9 @@ report_support()
             return
             :;
     esac
-    local heading
     heading=$1
     shift
 
-    local value
     value=$1
     shift
 
-- 
cgit v1.2.3


From 4fdf33a800874c89f44b3642a439adb5463e7921 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@digia.com>
Date: Tue, 25 Jun 2013 16:19:40 +0200
Subject: configure: Use $AWK instead of plain 'awk'

The $AWK variable already contains the best awk version
available. Possible values for this variable are: gawk, nawk or
awk.

Using just awk fails on Solaris with:

  user@localhost:~/qtbase$ ./configure -platform solaris-g++
  awk: syntax error near line 4
  awk: bailing out near line 4

  This is the Qt Open Source Edition.

Change-Id: I02a17915e8b27a5ce7e831a1225872cf460b3a6b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 7cdb4af8a6..dacf3826b3 100755
--- a/configure
+++ b/configure
@@ -3036,7 +3036,7 @@ gccout=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -
 libdirs=`echo "$gccout" | sed -n -e 's/^LIBRARY_PATH=\(.*\)/\1/p'`
 DEFAULT_LIBDIRS=`IFS=${HOST_DIRLIST_SEP}; for i in $libdirs; do test -d "$i" && cd "$i" && pwd; done`
 # extract from indented lines between '#include <...> search starts here:' and 'End of search list.'
-DEFAULT_INCDIRS=`echo "$gccout" | awk '
+DEFAULT_INCDIRS=`echo "$gccout" | $AWK '
 /^End of search/ { yup=0 }
 / \(framework directory\)$/ { next }
 yup { print substr($0, 2) }
@@ -6086,7 +6086,7 @@ case "$XPLATFORM" in
 	;;
     solaris-cc*)
         # Check the compiler version
-        case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
+        case `${QMAKE_CONF_COMPILER} -V 2>&1 | $AWK '{print $4}'` in
             5.[012345678])
                 canBuildWebKit="no"
                 canBuildQtXmlPatterns="no"
-- 
cgit v1.2.3