Save configuration feedback into config.summary

[profile/ivi/qtbase.git] / configure

diff --git a/configure b/configure
index 6103961..6ed6969 100755 (executable)
--- a/configure
+++ b/configure
@@ -2563,12 +2563,6 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
     fi
 fi
 
-# don't autodetect support for separate debug info on objcopy when
-# cross-compiling as lots of toolchains seems to have problems with this
-if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
-    CFG_SEPARATE_DEBUG_INFO="no"
-fi
-
 # auto-detect support for separate debug info in objcopy
 if [ "$CFG_SEPARATE_DEBUG_INFO" != "no" ] && [ "$CFG_SHARED" = "yes" ]; then
     TEST_COMPILER_CFLAGS=`getXQMakeConf QMAKE_CFLAGS`
@@ -2897,20 +2891,12 @@ if [ "$OPT_HELP" = "yes" ]; then
         DBN=" "
     fi
 
-    if [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
-        if [ "$QT_CROSS_COMPILE" = "yes" ]; then
-            SBY=""
-            SBN="*"
-        else
-            SBY="*"
-            SBN=" "
-        fi
-    elif [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
-        SBY="*"
-        SBN=" "
-    else
+    if [ "$CFG_SEPARATE_DEBUG_INFO" = "no" ]; then
         SBY=" "
         SBN="*"
+    else
+        SBY="*"
+        SBN=" "
     fi
 
     if [ "$CFG_GLIB" = "no" ]; then
@@ -5850,6 +5836,7 @@ fi
 #-------------------------------------------------------------------------------
 # give feedback on configuration
 #-------------------------------------------------------------------------------
+exec 3>&1 1>$outpath/config.summary # redirect output temporarily to config.summary
 
 case "$COMPILER" in
 g++*)
@@ -6059,6 +6046,10 @@ if [ "$CFG_OPENSSL" = "linked" ] && [ "$OPENSSL_LIBS" = "" ]; then
     echo "    OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked"
     echo
 fi
+
+exec 1>&3 3>&- # restore stdout
+cat $outpath/config.summary # display config feedback to user
+
 if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then
     echo
     echo "Error: debug-only framework builds are not supported. Configure with -no-framework"