X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cflags.SH;h=2e7ecf357d6639eae7d365ff074f823e75aeb5aa;hb=869efde7048cf4e4bafcc463f8d4209a63e0d41a;hp=fe4bacc2197474ded7dc37c9534108835dc00e0d;hpb=11e2f3951f887b9dc9a05482e3aef1a5feaf3528;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/cflags.SH b/cflags.SH
index fe4bacc..2e7ecf3 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -17,7 +17,7 @@ case "$0" in
 */*) cd `expr X$0 : 'X\(.*\)/'` ;;
 esac
 
-if test -f config_h.SH && ! test -f config.h; then
+if test -f config_h.SH -a ! -f config.h; then
     . ./config_h.SH
     CONFIG_H=already-done
 fi
@@ -119,7 +119,7 @@ case "$gccversion" in
 '') ;;
 [12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this.
 Intel*) ;; # # Is that you, Intel C++?
-*)  for opt in -ansi -pedantic -std=c89 -W -Wextra -Wdeclaration-after-statement -Wendif-labels
+*)  for opt in -ansi -pedantic -std=c89 -W -Wextra -Wdeclaration-after-statement -Wendif-labels -Wc++-compat
     do
        case " $ccflags " in
        *" $opt "*) ;; # Skip if already there.
@@ -304,6 +304,7 @@ case "$cc" in
   done
   ;;
 esac
+cppflags=`echo $cppflags|sed 's/-Wdeclaration-after-statement/ /'`
 
 case "$cc" in
 *g++*)