yugui	2010-09-29 21:25:31 +0900 (Wed, 29 Sep 2010)

  New Revision: 29371

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

  Log:
    merges r29066 from trunk into ruby_1_9_2.
    --
    * configure.in: fix typo.  a patch from Eric Wong at
      [ruby-core:31810].

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/configure.in
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/configure.in
===================================================================
--- ruby_1_9_2/configure.in	(revision 29370)
+++ ruby_1_9_2/configure.in	(revision 29371)
@@ -152,7 +152,7 @@
 AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
 # RUBY_UNIVERSAL_ARCH begin
 test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
-test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
+test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
 unset ARCH_FLAG universal_binary universal_archnames
 if test ${target_archs+set}; then
     AC_MSG_CHECKING([target architectures])
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29370)
+++ ruby_1_9_2/ChangeLog	(revision 29371)
@@ -1,3 +1,8 @@
+Sun Aug 22 05:55:01 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: fix typo.  a patch from Eric Wong at
+	  [ruby-core:31810].
+
 Thu Aug 19 12:04:39 2010  Kenta Murata  <mrkn@m...>
 
 	* array.c (rb_ary_permutation, rb_ary_repeated_permutation,
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29370)
+++ ruby_1_9_2/version.h	(revision 29371)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2010-09-29"
-#define RUBY_PATCHLEVEL 4
+#define RUBY_PATCHLEVEL 5
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9

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