diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-11 11:45:32 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-11 11:45:32 +0000 |
| commit | 18bd7f8c845e392995d738f3bca3675b7b265e23 (patch) | |
| tree | 5d66fde62ed3c7bae9c790d9238a37f20bc465a2 /configure.in | |
| parent | 536e266e58e6fda550e781d7a88317fdfe149cfa (diff) | |
* configure.in (SYMBOL_PREFIX): separate from EXPORT_PREFIX.
* win32/mkexports.rb (Exports#each_export): use SYMBOL_PREFIX.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 5dede8d33e..3adba3c69e 100644 --- a/configure.in +++ b/configure.in @@ -2349,16 +2349,16 @@ AC_SUBST(INSTALLDOC) if test "$rb_with_pthread" = "yes"; then THREAD_MODEL=pthread fi -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']` +AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [ + AC_TRY_COMPILE([extern void conftest_external(void) {}], [], [ + rb_cv_symbol_prefix=`$NM conftest.$ac_objext | + sed -n ['/.*[ ]\([^ ]*\)conftest_external.*/!d;s//\1/p;q']` ], - [rb_cv_export_prefix='']) - test -n "$rb_cv_export_prefix" || rb_cv_export_prefix=NONE + [rb_cv_symbol_prefix='']) + test -n "$rb_cv_symbol_prefix" || rb_cv_symbol_prefix=NONE ]) -EXPORT_PREFIX="$rb_cv_export_prefix" -test "x$EXPORT_PREFIX" = xNONE && EXPORT_PREFIX='' +SYMBOL_PREFIX="$rb_cv_symbol_prefix" +test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX='' MINIDLNOBJ=dmydln.o AS_CASE(["$target_os"], [linux*], [ @@ -2424,7 +2424,7 @@ AS_CASE(["$target_os"], LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' fi - test -z "$EXPORT_PREFIX" && EXPORT_PREFIX=' ' + EXPORT_PREFIX=' ' DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)' AC_LIBOBJ([win32]) COMMON_LIBS=m @@ -2557,6 +2557,7 @@ AC_SUBST(COMMON_LIBS) AC_SUBST(COMMON_MACROS) AC_SUBST(COMMON_HEADERS) AC_SUBST(EXPORT_PREFIX) +AC_SUBST(SYMBOL_PREFIX) AC_SUBST(MINIOBJS) AC_SUBST(THREAD_MODEL) |