diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-31 11:44:49 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-31 11:44:49 +0000 |
commit | f072d4e34a70d79a78d06616aad3658dd6b97141 (patch) | |
tree | e057c597ca1693829f73ebba7161435fc7176685 /configure.in | |
parent | 0d0c31ff8414edc38417b7b172819275e03f4dc3 (diff) |
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.in b/configure.in index d5e5be9e86..821b74ed50 100644 --- a/configure.in +++ b/configure.in @@ -156,13 +156,16 @@ AC_ARG_PROGRAM dnl Checks for programs. +: ${CFLAGS=} ${CXXFLAGS=} if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi AC_PROG_CC AC_PROG_GCC_TRADITIONAL +test $ac_cv_prog_cc_g = yes && : ${debugflags=-g} if test "$GCC" = yes; then linker_flag=-Wl, + : ${optflags=-O2} ${warnflags="-Wall -Wno-parentheses"} else linker_flag= fi @@ -1638,9 +1641,10 @@ CPPFLAGS="$CPPFLAGS "'$(DEFS)' test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' AC_SUBST(cppflags, [])dnl -AC_SUBST(cflags, ['${optflags} ${debugflags}'])dnl +AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(optflags)dnl AC_SUBST(debugflags)dnl +AC_SUBST(warnflags)dnl AC_SUBST(XCFLAGS)dnl AC_SUBST(XLDFLAGS)dnl AC_SUBST(LIBRUBY_LDSHARED) |