Move icc to the back of the queue

diff --git a/configure b/configure
index 0a04a410161fbc61acb35d952383ced71551bb12..4973a93a38ba129d7c5e4a300d20f36e8f11e7c7 100755 (executable)
--- a/configure
+++ b/configure
@@ -95,7 +95,7 @@ echo "MANDIR=         $MANDIR" >>$CONFIG_MK
 if [ -z "$CC" ]; then
        printf "Looking for compiler ... "
        for b in $TARGET- ""; do
-               for cc in icc gcc pcc cc; do
+               for cc in gcc pcc icc cc; do
                        if type $b$cc >/dev/null 2>&1; then
                                CC=$b$cc
                                echo "$CC"
@@ -124,11 +124,13 @@ fi
 if [ "$DEBUG" != no -a "$DEBUG" != false ]; then
        echo "Enabling memory debugging"
        echo "CPPFLAGS+=        -DDEBUG_MEMORY" >>$CONFIG_MK
-elif [ -d .git ]; then
+elif [ -z "$DEBUG" -a -d .git ]; then
        printf "Found git ... "
        DEBUG=yes
+else
+       DEBUG=no
 fi
-if [ "$DEBUG" != no -a "$DEBUG" != false ] || [ -e .git ]; then
+if [ "$DEBUG" != no -a "$DEBUG" != false ]; then
        echo "Adding debugging CFLAGS"
        cat <<EOF >>$CONFIG_MK
 CFLAGS+=       -Wall -Wextra -Wimplicit -Wshadow -Wformat=2