diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-05 21:14:25 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-05 21:14:25 +0000 |
| commit | deba55eb1a950b72788aa4cab10ccc032c1d37a7 (patch) | |
| tree | d50faa0cedcc55a27c957fed9f0b2b30257e6fab | |
| parent | 4a69c35c72aaf5f55b1a7a011e45f8834e7493c5 (diff) | |
| download | ruby-deba55eb1a950b72788aa4cab10ccc032c1d37a7.tar.gz | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | template/verconf.h.tmpl | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -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) diff --git a/configure.in b/configure.in index d0f22706aa..ce9939cdd9 100644 --- a/configure.in +++ b/configure.in @@ -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) diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl index 79c003e09f..5ee8a0e472 100644 --- a/template/verconf.h.tmpl +++ b/template/verconf.h.tmpl @@ -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}" |