X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cflags.SH;h=af1b43b4feba199793b186fa34a871ca8cf4f9b3;hb=3376a30ff58c3873904ed75bb471f95c5ecf3651;hp=62d19d635d21fef7a742a570af0c156e20d65acd;hpb=6ef8aa7c9cfbc9b6bc5d5b07d6e1506e3058b4aa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/cflags.SH b/cflags.SH
index 62d19d6..af1b43b 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -17,8 +17,9 @@ case "$0" in
 */*) cd `expr X$0 : 'X\(.*\)/'` ;;
 esac
 
-if ! test -f config.h; then
+if test -f config_h.SH -a ! -f config.h; then
     . ./config_h.SH
+    CONFIG_H=already-done
 fi
 
 warn=''
@@ -118,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.
@@ -299,7 +300,7 @@ case "$cc" in
   # but then whined about.
   for f in -Wdeclaration-after-statement -std=c89
   do
-    ccflags="`echo $ccflags|sed 's/$f/ /'`"
+    ccflags=`echo $ccflags|sed 's/$f/ /'`
   done
   ;;
 esac