ruby-changes:36642
From: nobu <ko1@a...>
Date: Sat, 6 Dec 2014 06:14:33 +0900 (JST)
Subject: [ruby-changes:36642] nobu:r48723 (trunk): configure.in: fix --with-ruby-version [ci skip]
nobu 2014-12-06 06:14:25 +0900 (Sat, 06 Dec 2014) New Revision: 48723 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48723 Log: configure.in: fix --with-ruby-version [ci skip] * configure.in (RUBY_LIB_VERSION): Fix --with-ruby-version configuration option. get rid of quoting in config.status. * template/verconf.h.tmpl: quote RUBY_LIB_VERSION here. [ruby-core:66724] [Bug #10572] Modified files: trunk/ChangeLog trunk/configure.in trunk/template/verconf.h.tmpl Index: configure.in =================================================================== --- configure.in (revision 48722) +++ configure.in (revision 48723) @@ -4000,7 +4000,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t https://github.com/ruby/ruby/blob/trunk/configure.in#L4000 elif test -z "${ruby_version}"; then AC_MSG_ERROR([No ruby version, No place for bundled libraries]) else - RUBY_LIB_VERSION="\"${ruby_version}\"" + RUBY_LIB_VERSION="${ruby_version}" fi AC_SUBST(RUBY_LIB_VERSION_STYLE) AC_SUBST(RUBY_LIB_VERSION) Index: ChangeLog =================================================================== --- ChangeLog (revision 48722) +++ ChangeLog (revision 48723) @@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Sat Dec 6 06:14:23 2014 Vit Ondruch <vondruch@r...> + + * configure.in (RUBY_LIB_VERSION): Fix --with-ruby-version + configuration option. get rid of quoting in config.status. + + * template/verconf.h.tmpl: quote RUBY_LIB_VERSION here. + [ruby-core:66724] [Bug #10572] + Sat Dec 6 04:33:52 2014 NAKAMURA Usaku <usa@r...> * lib/pp.rb (File::Stat#pritty_print): some platforms (such as Windows) Index: template/verconf.h.tmpl =================================================================== --- template/verconf.h.tmpl (revision 48722) +++ template/verconf.h.tmpl (revision 48723) @@ -8,7 +8,7 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.tmpl#L8 % elsif !C["RUBY_LIB_VERSION"] #define RUBY_LIB_VERSION_STYLE 3 /* full */ % else -#define RUBY_LIB_VERSION ${RUBY_LIB_VERSION} +#define RUBY_LIB_VERSION "${RUBY_LIB_VERSION}" % end #define RUBY_EXEC_PREFIX "<%='${RUBY_EXEC_PREFIX}' if C['RUBY_EXEC_PREFIX']%>" #define RUBY_LIB_PREFIX "${rubylibprefix}" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/