diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Tue Nov 9 21:13:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (EXPORT_PREFIX): check generic prefix. + Tue Nov 9 13:24:33 2010 NARUSE, Yui <naruse@ruby-lang.org> * regenc.c (onigenc_minimum_property_name_to_ctype): diff --git a/configure.in b/configure.in index dc8cb7cf39..808bba8a41 100644 --- a/configure.in +++ b/configure.in @@ -2346,13 +2346,16 @@ AC_SUBST(INSTALLDOC) if test "$rb_with_pthread" = "yes"; then THREAD_MODEL=pthread fi -AC_CACHE_CHECK([for prefixed underscore of exported symbols], rb_cv_export_prefix, [ +AC_CACHE_CHECK([for prefix of exported symbols], rb_cv_export_prefix, [ AC_TRY_COMPILE([extern void conftest_exported(void) {}], [], [ rb_cv_export_prefix=`$NM conftest.$ac_objext | - sed -n ['/.*\(_\)conftest_exported.*/!d;s//\1/p;q']` + sed -n ['/.*[ ]\([^ ]*\)conftest_exported.*/!d;s//\1/p;q']` ], [rb_cv_export_prefix='']) + test -n "$rb_cv_export_prefix" || rb_cv_export_prefix=NONE ]) +EXPORT_PREFIX="$rb_cv_export_prefix" +test "x$EXPORT_PREFIX" = xNONE && EXPORT_PREFIX='' MINIDLNOBJ=dmydln.o AS_CASE(["$target_os"], [linux*], [ @@ -2418,8 +2421,7 @@ AS_CASE(["$target_os"], LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' fi - test -z "$rb_cv_export_prefix" && rb_cv_export_prefix=' ' - EXPORT_PREFIX="$rb_cv_export_prefix" + test -z "$EXPORT_PREFIX" && EXPORT_PREFIX=' ' DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)' AC_LIBOBJ([win32]) COMMON_LIBS=m |