diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-09 08:46:02 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-09 08:46:02 +0000 |
commit | c4544321cbab43afe53fb65c1f7e41f02309e64a (patch) | |
tree | a29b9e58b96ce59798264832c46f2c216aed7840 | |
parent | 8a91512692dea480c3486ce8cf138bd831f1fb57 (diff) | |
download | ruby-c4544321cbab43afe53fb65c1f7e41f02309e64a.tar.gz |
configure.in: empty version
* configure.in, version.c: prevent duplicated load paths by empty
version string, it does not work right now.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | version.c | 2 |
3 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Feb 9 17:45:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in, version.c: prevent duplicated load paths by empty + version string, it does not work right now. + Sat Feb 9 17:38:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in: fix arch parameters in help message. [Bug #7804] diff --git a/configure.in b/configure.in index 86b42a70d8..5eed90dfe2 100644 --- a/configure.in +++ b/configure.in @@ -3235,6 +3235,8 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then test -f verconf.h || > verconf.h ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" eval $ruby_version +elif test -z "${ruby_version}"; then + AC_MSG_ERROR([No ruby version, No place for bundled libraries]) else RUBY_LIB_VERSION="\"${ruby_version}\"" fi @@ -39,6 +39,8 @@ #define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby" #endif +typedef char ruby_lib_version_string[(int)sizeof(RUBY_LIB_VERSION) - 2]; + #define RUBY_LIB RUBY_LIB_PREFIX "/"RUBY_LIB_VERSION #define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION |