mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
316b78a56d
commit
5c759e6b1c
3 changed files with 11 additions and 5 deletions
|
@ -1,3 +1,7 @@
|
|||
Mon Nov 17 02:19:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
|
||||
|
||||
Sat Nov 15 22:46:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* re.c (rb_reg_regsub): returns -1 unless ascii as well as
|
||||
|
|
|
@ -1673,9 +1673,9 @@ ENABLE_SHARED=no
|
|||
AC_ARG_ENABLE(shared,
|
||||
[ --enable-shared build a shared library for Ruby. ],
|
||||
[enable_shared=$enableval])
|
||||
LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
|
||||
if test "$enable_shared" = 'yes'; then
|
||||
LIBRUBY='$(LIBRUBY_SO)'
|
||||
LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
|
||||
LIBRUBYARG='$(LIBRUBYARG_SHARED)'
|
||||
CFLAGS="$CFLAGS $CCDLFLAGS"
|
||||
ENABLE_SHARED=yes
|
||||
|
@ -1752,7 +1752,9 @@ if test "$enable_shared" = 'yes'; then
|
|||
esac
|
||||
fi
|
||||
if test "$enable_rpath" = yes; then
|
||||
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
|
||||
LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir)"
|
||||
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
|
||||
LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
|
||||
fi
|
||||
|
||||
LDFLAGS="-L. $LDFLAGS"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#define RUBY_VERSION "1.9.0"
|
||||
#define RUBY_RELEASE_DATE "2008-11-15"
|
||||
#define RUBY_RELEASE_DATE "2008-11-17"
|
||||
#define RUBY_VERSION_CODE 190
|
||||
#define RUBY_RELEASE_CODE 20081115
|
||||
#define RUBY_RELEASE_CODE 20081117
|
||||
#define RUBY_PATCHLEVEL 0
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
|
@ -9,7 +9,7 @@
|
|||
#define RUBY_VERSION_TEENY 0
|
||||
#define RUBY_RELEASE_YEAR 2008
|
||||
#define RUBY_RELEASE_MONTH 11
|
||||
#define RUBY_RELEASE_DAY 15
|
||||
#define RUBY_RELEASE_DAY 17
|
||||
|
||||
#ifdef RUBY_EXTERN
|
||||
RUBY_EXTERN const char ruby_version[];
|
||||
|
|
Loading…
Reference in a new issue