From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 22 Jul 2008 15:28:06 +0000 (+0100)
Subject: Nicer fix for spurious messages from configure when GCC3 is missing.
X-Git-Tag: t.master-before-merge~101^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=01595043c0c6c43f99352d58f293e590c405e3ee;p=qemu-xen-4.0-testing.git

Nicer fix for spurious messages from configure when GCC3 is missing.

This reverts b5123e05cce4be4c6c8c822fad0f0df4c053da06 and replaces it
with a nice simple change, namely to change  test ... -a ...  with
test ... && test ... .  That provides shortcut evaluation.

Thanks to Andre Przywara who provided this one-line change as an
update to the previous commit.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/configure b/configure
index 5d1825f4..f138bec2 100755
--- a/configure
+++ b/configure
@@ -1204,16 +1204,11 @@ case "$target_cpu" in
     fi
     echo "#define CONFIG_DYNGEN_OP 1" >> $config_h
     gcc3minver=`$cc --version 2> /dev/null| fgrep "(GCC) 3." | awk '{ print $3 }' | cut -f2 -d.`
-    if test -n "$gcc3minver"
+    if test -n "$gcc3minver" && test $gcc3minver -gt 3
     then
-      if test -a $gcc3minver -gt 3;
-      then
-        echo "HAVE_GT_GCC_3_3=true" >> $config_mak
-      else
-        echo "HAVE_GT_GCC_3_3=false" >> $config_mak
-      fi
-    else
       echo "HAVE_GT_GCC_3_3=true" >> $config_mak
+    else
+      echo "HAVE_GT_GCC_3_3=false" >> $config_mak
     fi
   ;;
   x86_64)