diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-19 05:48:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-19 05:48:14 +0000 |
| commit | 6d3ceb6ce38f91898dfc388fc96f5401ff3edc52 (patch) | |
| tree | 84e1e4fe2fc00341d7253e24221a2412e21b2144 /configure.in | |
| parent | e2f62813029b886850901daa2dc2aec0008f5730 (diff) | |
* configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.in b/configure.in index bdbffb06e9..76b825b715 100644 --- a/configure.in +++ b/configure.in @@ -1664,7 +1664,11 @@ else when(nextstep*|openstep*|rhapsody*|darwin*) DLEXT=bundle;; when(os2-emx*) + LOAD_RELATIVE=1 DLEXT=dll;; + when(cygwin*|mingw*|*djgpp*) + LOAD_RELATIVE=1 + DLEXT=so;; when(*) DLEXT=so;; esac @@ -2132,18 +2136,16 @@ AC_ARG_WITH(vendordir, [vendordir='${libdir}/${RUBY_INSTALL_NAME}/vendor_ruby']) VENDOR_DIR=`eval echo \\"${vendordir}\\"` -case "$target_os" in - when(cygwin*|mingw*|*djgpp*|os2-emx*) +if test "${LOAD_RELATIVE+set}"; then + AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`" RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`" RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`" - ;; - when(*) +else RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`" RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`" RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`" - ;; -esac +fi pat="$RUBY_LIB_PREFIX/"'\(.*\)' RUBY_LIB_PATH='RUBY_LIB_PREFIX"/"RUBY_LIB_VERSION' |