ruby-changes:27119
From: nobu <ko1@a...>
Date: Sat, 9 Feb 2013 17:46:13 +0900 (JST)
Subject: [ruby-changes:27119] nobu:r39171 (trunk): configure.in: empty version
nobu 2013-02-09 17:46:02 +0900 (Sat, 09 Feb 2013) New Revision: 39171 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39171 Log: configure.in: empty version * configure.in, version.c: prevent duplicated load paths by empty version string, it does not work right now. Modified files: trunk/ChangeLog trunk/configure.in trunk/version.c Index: configure.in =================================================================== --- configure.in (revision 39170) +++ configure.in (revision 39171) @@ -3235,6 +3235,8 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t https://github.com/ruby/ruby/blob/trunk/configure.in#L3235 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 Index: ChangeLog =================================================================== --- ChangeLog (revision 39170) +++ ChangeLog (revision 39171) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Sat Feb 9 17:45:58 2013 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> * configure.in: fix arch parameters in help message. [Bug #7804] Index: version.c =================================================================== --- version.c (revision 39170) +++ version.c (revision 39171) @@ -39,6 +39,8 @@ https://github.com/ruby/ruby/blob/trunk/version.c#L39 #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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/