naruse	2012-07-29 04:32:36 +0900 (Sun, 29 Jul 2012)

  New Revision: 36562

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

  Log:
    merge revision(s) 34880:
    
    * configure.in (ruby_pc): make configurable.  [Bug #6051]

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

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 36561)
+++ ruby_1_9_3/configure.in	(revision 36562)
@@ -3038,7 +3038,10 @@
     }],
 [EXEEXT='$EXEEXT' gnumake='$gnumake'])
 
-ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"
+AC_ARG_WITH([ruby-pc],
+	    AC_HELP_STRING([pc file basename]),
+	    [ruby_pc="$withval"],
+	    [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"])
 AC_SUBST(ruby_pc)
 AC_SUBST(exec, [exec])
 
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36561)
+++ ruby_1_9_3/ChangeLog	(revision 36562)
@@ -1,3 +1,7 @@
+Sun Jul 29 04:32:31 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (ruby_pc): make configurable.  [Bug #6051]
+
 Sun Jul 29 04:32:06 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36561)
+++ ruby_1_9_3/version.h	(revision 36562)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 256
+#define RUBY_PATCHLEVEL 257
 
 #define RUBY_RELEASE_DATE "2012-07-29"
 #define RUBY_RELEASE_YEAR 2012

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