* configure.in (cflags, cxxflags): remove duplicating options.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
cfis · Oct 10, 2009 · 7c66907 · 7c66907
1 parent 66150a8
commit 7c66907
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 10 18:59:17 2009  Nobuyoshi Nakada  <[email protected]>
+
+	* configure.in (cflags, cxxflags): remove duplicating options.
+
 Sat Oct 10 18:19:03 2009  Nobuyoshi Nakada  <[email protected]>
 
 	* configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp),

diff --git a/configure.in b/configure.in
@@ -239,11 +239,20 @@ AC_ARG_PROGRAM
 
 dnl Checks for programs.
 
+cflagspat=
+test -z "$optflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "$debugflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "warnflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
 if test -z "${CFLAGS+set}"; then
+    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
     orig_cflags="$cflags"
     cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
 fi
 if test -z "${CXXFLAGS+set}"; then
+    cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
     orig_cxxflags="$cxxflags"
     cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
 fi