diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-31 15:02:22 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-31 15:02:22 +0000 |
| commit | a3e1b1ce7ed7e7ffac23015fc2fde56511b30681 (patch) | |
| tree | 7b725552a9a4ded93849ca2faab1b257f7761790 /configure.in | |
| parent | 3e7566d8fb5138bb9cd647e5fdefc54fc9803509 (diff) | |
* Merge YARV
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 1fd0155821..be6bbd2129 100644 --- a/configure.in +++ b/configure.in @@ -71,6 +71,7 @@ fi if test "$program_prefix" = NONE; then program_prefix= fi + AC_CANONICAL_TARGET target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'` ac_install_sh='' # unusable for extension libraries. @@ -183,7 +184,7 @@ cygwin*|mingw*) AC_TRY_LINK([#include <stdio.h>], [FILE* volatile f = stdin; return 0;], [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext | - tr A-Z a-z | + tr A-Z a-z | sed -n '/^[[ ]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`], [rb_cv_msvcrt=msvcrt]) test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt]) @@ -345,7 +346,7 @@ AC_ARG_WITH(libc_r, AC_ARG_ENABLE(pthread, [ --enable-pthread use pthread library.], - [enable_pthread=$enableval], [enable_pthread=no]) + [enable_pthread=$enableval], [enable_pthread=yes]) dnl Checks for libraries. case "$target_os" in @@ -831,6 +832,8 @@ if test x"$ac_cv_header_ucontext_h" = xyes; then fi fi +AC_CHECK_FUNCS(backtrace) + dnl default value for $KANJI DEFAULT_KCODE="KCODE_NONE" @@ -1004,11 +1007,11 @@ if test "$with_dln_a_out" != yes; then LDFLAGS='-brtl' XLDFLAGS='-bE:ruby.imp' fi - : ${ARCHFILE="ruby.imp"} + : ${ARCHFILE="ruby.imp"} TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)' TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)' - : ${LIBPATHENV=SHLIB_PATH} - rb_cv_dlopen=yes ;; + : ${LIBPATHENV=SHLIB_PATH} + rb_cv_dlopen=yes ;; human*) : ${DLDFLAGS=''} : ${LDSHARED=''} : ${LDFLAGS=''} @@ -1354,7 +1357,7 @@ if test "$enable_shared" = 'yes'; then fi if test "$enable_rpath" = yes; then if test "$GCC" = yes; then - LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" + LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" else LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" fi |