diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 8 insertions, 2 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 diff --git a/configure.in b/configure.in index 3051da2df..f952e2297 100644 --- a/configure.in +++ b/configure.in @@ -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" |