diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-30 04:11:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-30 04:11:21 +0000 |
| commit | a18558140a9476d625bf12ed1df56467f971f25e (patch) | |
| tree | 8580fbe12190b614fc0c97f93f09df243be34620 /configure.in | |
| parent | 8800a83f85327c158b79eb377723d207207f6522 (diff) | |
configure.in: runnable if disable-shared
* configure.in (LIBRUBY_RELATIVE): libruby_so is not made when
disable-shared, so no absolute path is used for it and executable
file is runnable anywhere.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 3bb58b3d39..9041b9c509 100644 --- a/configure.in +++ b/configure.in @@ -2405,10 +2405,13 @@ if test "$rb_cv_dlopen:$load_relative" = yes:yes; then AC_CHECK_FUNCS(dladdr) if test "$ac_cv_func_dladdr" = yes; then LOAD_RELATIVE=1 - else - unset load_relative fi fi +if test x"$LOAD_RELATIVE" = x1; then + load_relative=yes +else + unset load_relative +fi len=2 # .rb n=`expr "$DLEXT" : '.*'`; test "$n" -gt "$len" && len=$n @@ -2542,11 +2545,12 @@ AC_ARG_ENABLE(shared, AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]), [enable_shared=$enableval]) libprefix='$(libdir)' -LIBRUBY_RELATIVE=no +LIBRUBY_RELATIVE=${load_relative-no} AS_CASE("$enable_shared", [yes], [ LIBRUBY='$(LIBRUBY_SO)' LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)' LIBRUBYARG='$(LIBRUBYARG_SHARED)' + LIBRUBY_RELATIVE=no test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS" ENABLE_SHARED=yes if test "$rb_cv_binary_elf" = yes; then |