diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:50 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:50 +0000 |
| commit | 0ab06ec6bd637720e9ee7f042e86962bbf15a573 (patch) | |
| tree | 167a31e8dbbf2659d2511da9f979548eb0f2e7e6 /configure.in | |
| parent | 5b3f3d84d390ca3844fed31272225c7515bb1523 (diff) | |
| download | ruby-0ab06ec6bd637720e9ee7f042e86962bbf15a573.tar.gz ruby-0ab06ec6bd637720e9ee7f042e86962bbf15a573.tar.xz ruby-0ab06ec6bd637720e9ee7f042e86962bbf15a573.zip | |
merges r20239 from trunk into ruby_1_9_1
* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 4 insertions, 2 deletions
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" |