[前][次][番号順一覧][スレッド一覧]

ruby-changes:24499

From: nobu <ko1@a...>
Date: Fri, 27 Jul 2012 17:58:25 +0900 (JST)
Subject: [ruby-changes:24499] nobu:r36550 (trunk): configure.in: get rid of duplication in CPPFLAGS

nobu	2012-07-27 17:58:15 +0900 (Fri, 27 Jul 2012)

  New Revision: 36550

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36550

  Log:
    configure.in: get rid of duplication in CPPFLAGS
    
    * configure.in (RUBY_CPPOUTFILE): get rid of variable conflict so
      CPPFLAGS is not duplicated.  [ruby-core:43097] [Bug #6119]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 36549)
+++ configure.in	(revision 36550)
@@ -136,12 +136,12 @@
 
 AC_DEFUN([RUBY_CPPOUTFILE],
 [AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
-[cppflags=$CPPFLAGS
+[save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS='-o conftest-1.i'
 rb_cv_cppoutfile=no
 AC_TRY_CPP([test-for-cppout],
 	   [grep test-for-cppout conftest-1.i > /dev/null && rb_cv_cppoutfile=yes])
-CPPFLAGS=$cppflags
+CPPFLAGS="$save_CPPFLAGS"
 rm -f conftest*])
 if test "$rb_cv_cppoutfile" = yes; then
   CPPOUTFILE='-o conftest.i'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36549)
+++ ChangeLog	(revision 36550)
@@ -1,3 +1,8 @@
+Fri Jul 27 17:58:12 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_CPPOUTFILE): get rid of variable conflict so
+	  CPPFLAGS is not duplicated.  [ruby-core:43097] [Bug #6119]
+
 Fri Jul 27 12:12:36 2012  NAKAMURA Usaku  <usa@r...>
 
 	* win32/mkexports.rb: should not export DllMain().

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]