summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-08-01 13:31:55 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-05-12 18:31:38 +0000
commit8d5b1bdca8b13972fc653638fca426a5485343b1 (patch)
tree9d874d34706380185f71bad14cd9f1f213a1d4c7
parentc9998b8af39bcf990f4ef9a0ff87b65574a86bfd (diff)
configure: present some progress status for the detections
The "checking for xxx... [yes|no]" is chosen so that it matches exactly what GNU Autoconf does. That way, any tools that parse the output will have less trouble. This feature is useful for us when debugging a build, as not all checks produce output in the configure summary. Change-Id: Id75834dab9ed466e94c7ffff14456edb646a1ced Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rwxr-xr-xconfig.tests/unix/compile.test8
-rwxr-xr-xconfigure1
2 files changed, 4 insertions, 5 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index 598e2a2d4d..69d4285321 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -61,9 +61,6 @@ while [ "$#" -gt 0 ]; do
shift
done
-# debuggery
-[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
-
test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
cd "$OUTDIR/$TEST"
@@ -89,6 +86,7 @@ set -- \
"$SRCDIR/$TEST/$EXE.pro" \
-o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then
+ echo
OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
else
OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes
@@ -96,9 +94,9 @@ fi
# done
if [ "$SUCCESS" != "yes" ]; then
- [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled."
+ [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." || echo " no."
exit 1
else
- [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled."
+ [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." || echo " yes."
exit 0
fi
diff --git a/configure b/configure
index f4555a746b..4c052d5a23 100755
--- a/configure
+++ b/configure
@@ -4280,6 +4280,7 @@ compileTest()
if [ "$CFG_SHARED" = "no" ]; then
test_config="$QMAKE_CONFIG static"
fi
+ echo $ECHO_N "checking for $name... $ECHO_C"
"$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS "$@"
}