kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in: some tidy.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-02-03 13:20:43 +00:00
parent e7d267c42a
commit f9994ada30
1 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
configure.in
View file

@ -1611,10 +1611,7 @@ AC_ARG_WITH(dln-a-out,
AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf, AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
[AC_TRY_LINK([],[], [ [AC_TRY_LINK([],[], [
AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"], AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"],
['^?ELF'*], [ ['^?ELF'*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
rb_cv_binary_elf=yes],
[
rb_cv_binary_elf=no])],
rb_cv_binary_elf=no)]) rb_cv_binary_elf=no)])
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
@ -1706,24 +1703,24 @@ if test "$with_dln_a_out" != yes; then
[sysv4*], [ : ${LDSHARED='ld -G'} [sysv4*], [ : ${LDSHARED='ld -G'}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[nto-qnx*], [ : ${LDSHARED="qcc -shared"} [nto-qnx*], [ : ${LDSHARED="qcc -shared"}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[esix*|uxpds*], [ : ${LDSHARED="ld -G"} [esix*|uxpds*], [ : ${LDSHARED="ld -G"}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""} [osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[bsdi3*], [ AS_CASE(["$CC"], [bsdi3*], [ AS_CASE(["$CC"],
[*shlicc*], [ : ${LDSHARED="$CC -r"} [*shlicc*], [ : ${LDSHARED="$CC -r"}
rb_cv_dlopen=yes ]) ], rb_cv_dlopen=yes])],
[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
: ${LDSHARED='${CC} -shared'} : ${LDSHARED='${CC} -shared'}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic" LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi fi
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[interix*], [ : ${LDSHARED="$CC -shared"} [interix*], [ : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E" XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L%1\$-s" LIBPATHFLAG=" -L%1\$-s"
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[freebsd*|dragonfly*], [ [freebsd*|dragonfly*], [
: ${LDSHARED="$CC -shared"} : ${LDSHARED="$CC -shared"}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
@ -1732,21 +1729,21 @@ if test "$with_dln_a_out" != yes; then
else else
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi fi
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[openbsd*], [ : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"} [openbsd*], [ : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E" LDFLAGS="$LDFLAGS -Wl,-E"
fi fi
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[nextstep*], [ : ${LDSHARED='cc -r -nostdlib'} [nextstep*], [ : ${LDSHARED='cc -r -nostdlib'}
LDFLAGS="$LDFLAGS -u libsys_s" LDFLAGS="$LDFLAGS -u libsys_s"
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[openstep*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} [openstep*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
: ${LDFLAGS=""} : ${LDFLAGS=""}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[rhapsody*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} [rhapsody*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
: ${LDFLAGS=""} : ${LDFLAGS=""}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'} [darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'}
: ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"} : ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"}
: ${LDFLAGS=""} : ${LDFLAGS=""}
@ -1759,7 +1756,7 @@ if test "$with_dln_a_out" != yes; then
echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' || echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' ||
LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib" LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
fi fi
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[aix*], [ if test "$GCC" = yes; then [aix*], [ if test "$GCC" = yes; then
: ${LDSHARED='$(CC) -shared'} : ${LDSHARED='$(CC) -shared'}
else else
@ -1774,12 +1771,12 @@ if test "$with_dln_a_out" != yes; then
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)' TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
: ${LIBPATHENV=SHLIB_PATH} : ${LIBPATHENV=SHLIB_PATH}
RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s" RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s"
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[human*], [ : ${DLDFLAGS=''} [human*], [ : ${DLDFLAGS=''}
: ${LDSHARED=''} : ${LDSHARED=''}
: ${LDFLAGS=''} : ${LDFLAGS=''}
: ${LINK_SO='ar cru $@ $(OBJS)'} : ${LINK_SO='ar cru $@ $(OBJS)'}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[beos*], [ AS_CASE(["$target_cpu"], [beos*], [ AS_CASE(["$target_cpu"],
[powerpc*], [ [powerpc*], [
: ${LDSHARED="ld -xms"} : ${LDSHARED="ld -xms"}
@ -1792,7 +1789,7 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot" LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
]) ])
: ${LIBPATHENV=LIBRARY_PATH} : ${LIBPATHENV=LIBRARY_PATH}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[haiku*], [ AS_CASE(["$target_cpu"], [haiku*], [ AS_CASE(["$target_cpu"],
[powerpc*], [ [powerpc*], [
: ${LDSHARED="ld -xms"} : ${LDSHARED="ld -xms"}
@ -1813,13 +1810,13 @@ if test "$with_dln_a_out" != yes; then
XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import" XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
: ${LIBPATHENV=""} : ${LIBPATHENV=""}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[hiuxmpp], [ : ${LDSHARED='ld -r'} ], [hiuxmpp], [ : ${LDSHARED='ld -r'}],
[atheos*], [ : ${LDSHARED="$CC -shared"} [atheos*], [ : ${LDSHARED="$CC -shared"}
rb_cv_dlopen=yes ], rb_cv_dlopen=yes],
[os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf" [os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf"
], ],
[ : ${LDSHARED='ld'} ]) [ : ${LDSHARED='ld'}])
AC_MSG_RESULT($rb_cv_dlopen) AC_MSG_RESULT($rb_cv_dlopen)
fi fi
if test "${LDSHAREDXX}" = ""; then if test "${LDSHAREDXX}" = ""; then
@ -2076,8 +2073,6 @@ if test "$enable_shared" = 'yes'; then
], ],
[interix*], [ [interix*], [
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
],
[
]) ])
fi fi
if test "$enable_rpath" = yes; then if test "$enable_rpath" = yes; then