From f6761088a4eb4d51765d9ea032e15dc5a581958f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 23 Nov 2012 15:00:12 +0000
Subject: 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
---
 ChangeLog    | 5 +++++
 Makefile.in  | 1 +
 common.mk    | 2 +-
 configure.in | 5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d6f15ba628..b6c8ab26ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@
diff --git a/common.mk b/common.mk
index 4e48b1526d..bf9c607e5b 100644
--- a/common.mk
+++ b/common.mk
@@ -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"],
-- 
cgit v1.2.3