Add a new Porting/podtidy to reformat pod using Pod::Tidy

[p5sagit/p5-mst-13.2.git] / cflags.SH

diff --git a/cflags.SH b/cflags.SH
index f8ad3ef..9e0494e 100755 (executable)
--- a/cflags.SH
+++ b/cflags.SH
@@ -134,7 +134,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 -Wc++-compat
+*)  for opt in -ansi -std=c89 -W -Wextra -Wdeclaration-after-statement -Wendif-labels -Wc++-compat
     do
        case " $ccflags " in
        *" $opt "*) ;; # Skip if already there.
@@ -183,7 +183,7 @@ case "$gccversion" in
     "long long")
        ccflags=`echo $ccflags|sed -e 's/-pedantic/ /' -e 's/-std=c89/ /' -e 's/-ansi/ /'`
        warn=`echo $warn|sed -e 's/-pedantic/ /' -e 's/-ansi/ /'`
-       stdflags=`echo $warn|sed -e 's/-std=c89/ /'`
+       stdflags=`echo $stdflags|sed -e 's/-std=c89/ /'`
        ;;
     esac
   fi
@@ -354,8 +354,12 @@ case "$cc" in
   ;;
 esac
 
-if test -f .patch; then
-  ccflags="-DPERL_PATCHNUM=`cat .patch` $ccflags"
+if test -d .git; then
+  ccflags="-DPERL_PATCHNUM=`git describe` $ccflags"
+else
+  if test -f .patch; then
+    ccflags="-DPERL_PATCHNUM=`awk '{print $4}' .patch` $ccflags"
+  fi
 fi
 
     : Can we perhaps use $ansi2knr here