diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 11 |
2 files changed, 9 insertions, 8 deletions
@@ -1,7 +1,7 @@ -Mon Apr 6 20:16:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Apr 6 23:16:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in (CFLAGS, CXXFLAGS): use orignal values if given. - [ruby-core:23130] + * configure.in (CFLAGS, CXXFLAGS): override with $cflags and + $cxxflags if not given. [ruby-core:23130] Mon Apr 6 19:26:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> diff --git a/configure.in b/configure.in index 7a48d3e13..10b4e76e8 100644 --- a/configure.in +++ b/configure.in @@ -216,12 +216,13 @@ dnl Checks for programs. if test -z "${CFLAGS+set}"; then orig_cflags="$cflags" - cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'} + cflags="$cflags "'${optflags} ${debugflags} ${warnflags}' fi if test -z "${CXXFLAGS+set}"; then orig_cxxflags="$cxxflags" - cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'} + cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}' fi + if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi @@ -347,8 +348,8 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then warnflags="-Wall -Wno-unused-parameter -Wno-parentheses ${warnflags+$warnflags }-Wpointer-arith -Wwrite-strings" fi -test -n "${cflags+set}" && CFLAGS="${CFLAGS} `eval echo $cflags`" -test -n "${cxxflags+set}" && CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`" +test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && CFLAGS="`eval echo $cflags`" +test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && CXXFLAGS="`eval echo $cxxflags`" dnl check for large file stuff mv confdefs.h confdefs1.h @@ -2219,7 +2220,7 @@ if test "${ARCH_FLAG}"; then LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` fi AC_SUBST(cppflags, [])dnl -AC_SUBST(cflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl +AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(optflags)dnl AC_SUBST(debugflags)dnl |