diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-23 15:00:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-23 15:00:12 +0000 |
| commit | f6761088a4eb4d51765d9ea032e15dc5a581958f (patch) | |
| tree | feed6cd461f4ff5bfbacec2901870507d47cc40d | |
| parent | e54cd2bd97b4da5e9a02ab35cdb3f75f4b645b06 (diff) | |
| download | ruby-f6761088a4eb4d51765d9ea032e15dc5a581958f.tar.gz | |
configure.in: --disable-dln
* configure.in (--disable-dln): option to disable dynamic linking
feature. [ruby-core:37676] [Feature #4946]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | configure.in | 5 |
4 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Nov 24 00:00:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (--disable-dln): option to disable dynamic linking + feature. [ruby-core:37676] [Feature #4946] + Fri Nov 23 23:44:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (MakeMakefile#pkg_config): strip all white spaces for diff --git a/Makefile.in b/Makefile.in index 7626ad1067..72770604ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,6 +72,7 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ MAINLIBS = @MAINLIBS@ ARCHMINIOBJS = @MINIOBJS@ +DLNOBJ = @DLNOBJ@ ENCOBJS = @ENCOBJS@ EXTOBJS = @EXTOBJS@ BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@ @@ -98,7 +98,7 @@ COMMONOBJS = array.$(OBJEXT) \ $(BUILTIN_TRANSOBJS) \ $(MISSING) -EXPORTOBJS = dln.$(OBJEXT) \ +EXPORTOBJS = $(DLNOBJ) \ encoding.$(OBJEXT) \ version.$(OBJEXT) \ $(COMMONOBJS) diff --git a/configure.in b/configure.in index 4564602ab5..d7d4a46660 100644 --- a/configure.in +++ b/configure.in @@ -2814,6 +2814,11 @@ AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [ ]) SYMBOL_PREFIX="$rb_cv_symbol_prefix" test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX='' +DLNOBJ=dln.o +AC_ARG_ENABLE(dln, + AC_HELP_STRING([--disable-dln], [disable dynamic link feature]), + [test "$enableval" = yes || DLNOBJ=dmydln.o]) +AC_SUBST(DLNOBJ) MINIDLNOBJ=dmydln.o AS_CASE(["$target_os"], |