[PATCH] Malformed g++ flags

[John Mandereau]

Hello,

With current Git master C++ flags are incorrect on my system:

cp -p /home/lilydev/git/lily/master/config.hh out/config.hh
rm -f ./out/all-font-metrics.dep;
DEPENDENCIES_OUTPUT="./out/all-font-metrics.dep ./out/all-font-metrics.o" g++ 
-c -Woverloaded-virtual  -I/usr/include/python2.5 -I/usr/include/python2.5 
-fno-strict-aliasing -g -pipe,-D_FORTIFY_SOURCE=2 -fexceptions 
-fstack-protector --param=ssp-buffer-size=4 -fPIC  -DHAVE_CONFIG_H  -DNDEBUG 
-I./include -I./out -I../flower/include -I../flower/./out -I../flower/include  
-O2 -finline-functions -g -pipe -pthread -I/usr/include/freetype2   
-I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 
-I/usr/lib64/glib-2.0/include   -Wno-pmf-conversions  -W -Wall -Wconversion -o 
out/all-font-metrics.o all-font-metrics.cc
g++: unrecognized option '-pipe,-D_FORTIFY_SOURCE=2'


The following patch fixes it for me; is it OK to apply?


diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 9e386f3..107b577 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -956,7 +962,7 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
     if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
         # Clean out junk: http://bugs.python.org/issue3290
        # Python headers may need some -f* flags, leave them in.
-       PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ 
-\(W\|D\|O\|m\)\(\w\|-\|=\)\+//g'`
+       PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ 
-\(W\|D\|O\|m\)\(\w\|-\|=\|,)\+//g'`
        PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
     fi
     
Cheers,
John