kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

configure.in: fix --with-ruby-version [ci skip]

Browse source 
* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-05 21:14:25 +00:00
parent 4a69c35c72
commit deba55eb1a
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sat Dec 6 06:14:23 2014 Vit Ondruch <vondruch@redhat.com>
* 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@ruby-lang.org>
* lib/pp.rb (File::Stat#pritty_print): some platforms (such as Windows)

2
configure.in
View file

@ -4000,7 +4000,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
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)

2
template/verconf.h.tmpl
View file

@ -8,7 +8,7 @@
% 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}"