diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-24 14:01:57 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-24 14:01:57 +0000 |
| commit | 30a4825aea33d5adf1ca36192f892d41aeb979df (patch) | |
| tree | 477335ef4427c6655240d00a184f8e7831b4e1ee /configure.in | |
| parent | 91e6d017906c53f8b73a34d0cd107f0d9fa2d0ad (diff) | |
| download | ruby-30a4825aea33d5adf1ca36192f892d41aeb979df.tar.gz | |
* configure.in: revert the previous commit, which seemed to break make
install. The files of standard libraries are directly installed to
$(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/configure.in b/configure.in index 575fc10fa0..ae1fb42099 100644 --- a/configure.in +++ b/configure.in @@ -1708,27 +1708,27 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes], [sysv4*], [ : ${LDSHARED='ld -G'} rb_cv_dlopen=yes], - [nto-qnx*], [ : ${LDSHARED='$(CC) -shared'} - rb_cv_dlopen=yes], + [nto-qnx*], [ : ${LDSHARED="qcc -shared"} + rb_cv_dlopen=yes], [esix*|uxpds*], [ : ${LDSHARED="ld -G"} rb_cv_dlopen=yes], [osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""} rb_cv_dlopen=yes], [bsdi3*], [ AS_CASE(["$CC"], - [*shlicc*], [ : ${LDSHARED='$(CC) -r'} + [*shlicc*], [ : ${LDSHARED="$CC -r"} rb_cv_dlopen=yes])], [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ - : ${LDSHARED='$(CC) -shared'} + : ${LDSHARED='${CC} -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes], - [interix*], [ : ${LDSHARED='$(CC) -shared'} + [interix*], [ : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L%1\$-s" rb_cv_dlopen=yes], [freebsd*|dragonfly*], [ - : ${LDSHARED='$(CC) -shared'} + : ${LDSHARED="$CC -shared"} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' @@ -1736,18 +1736,18 @@ if test "$with_dln_a_out" != yes; then test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes], - [openbsd*], [ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} + [openbsd*], [ : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" fi rb_cv_dlopen=yes], - [nextstep*], [ : ${LDSHARED='$(CC) -r -nostdlib'} + [nextstep*], [ : ${LDSHARED='cc -r -nostdlib'} LDFLAGS="$LDFLAGS -u libsys_s" rb_cv_dlopen=yes], - [openstep*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} + [openstep*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} rb_cv_dlopen=yes], - [rhapsody*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} + [rhapsody*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} rb_cv_dlopen=yes], [darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'} @@ -1812,13 +1812,13 @@ if test "$with_dln_a_out" != yes; then LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" rb_cv_dlopen=yes], [cygwin*|mingw*], [ - : ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'} + : ${LDSHARED="${CC} -shared "'$(if $(filter-out -g -g0,$(debugflags)),,-s)'} XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import" : ${LIBPATHENV=""} rb_cv_dlopen=yes], [hiuxmpp], [ : ${LDSHARED='ld -r'}], - [atheos*], [ : ${LDSHARED='$(CC) -shared'} + [atheos*], [ : ${LDSHARED="$CC -shared"} rb_cv_dlopen=yes], [os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf" ], @@ -1839,7 +1839,6 @@ if test "${LDSHAREDXX}" = ""; then [ld" "*], [ ]) fi -AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`]) AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}]) AC_SUBST(LINK_SO) |