nobu	2008-10-29 11:51:00 +0900 (Wed, 29 Oct 2008)

  New Revision: 20016

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20016

  Log:
    * configure.in (dln-a-out): cannot make shared library nor work with
      ELF.  [ruby-core:19571]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/configure.in
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 20015)
+++ configure.in	(revision 20016)
@@ -1253,7 +1253,13 @@
 AC_ARG_WITH(dln-a-out, 
 	[  --with-dln-a-out        use dln_a_out if possible], [
 	case $withval in
-	yes) with_dln_a_out=yes;;
+	dnl (
+	yes)
+	    if test "$enable_shared" = yes; then
+		AC_MSG_ERROR(dln_a_out can not make shared library)
+	    fi
+	    with_dln_a_out=yes;;
+	dnl (
 	*)   with_dln_a_out=no;;
 	esac], [with_dln_a_out=no])
 
@@ -1271,6 +1277,9 @@
 
 if test "$rb_cv_binary_elf" = yes; then
   AC_DEFINE(USE_ELF)
+  if test "$with_dln_a_out" = yes; then
+    AC_MSG_ERROR(dln_a_out does not work with ELF)
+  fi
 fi
 
 case "$target_os" in
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20015)
+++ ChangeLog	(revision 20016)
@@ -1,3 +1,8 @@
+Wed Oct 29 11:50:57 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (dln-a-out): cannot make shared library nor work with
+	  ELF.  [ruby-core:19571]
+
 Wed Oct 29 11:00:25 2008  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_open): shouldn't seek here.
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 20015)
+++ ruby_1_8/configure.in	(revision 20016)
@@ -1094,7 +1094,13 @@
 AC_ARG_WITH(dln-a-out, 
 	[  --with-dln-a-out        use dln_a_out if possible], [
 	case $withval in
-	yes) with_dln_a_out=yes;;
+	dnl (
+	yes)
+	    if test "$enable_shared" = yes; then
+		AC_MSG_ERROR(dln_a_out can not make shared library)
+	    fi
+	    with_dln_a_out=yes;;
+	dnl (
 	*)   with_dln_a_out=no;;
 	esac], [with_dln_a_out=no])
 
@@ -1112,6 +1118,9 @@
 
 if test "$rb_cv_binary_elf" = yes; then
   AC_DEFINE(USE_ELF)
+  if test "$with_dln_a_out" = yes; then
+    AC_MSG_ERROR(dln_a_out does not work with ELF)
+  fi
 fi
 
 case "$target_os" in
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 20015)
+++ ruby_1_8/ChangeLog	(revision 20016)
@@ -1,3 +1,8 @@
+Wed Oct 29 11:50:57 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (dln-a-out): cannot make shared library nor work with
+	  ELF.  [ruby-core:19571]
+
 Thu Oct 23 01:24:49 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (create_tmpsrc): get rid of side effects.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 20015)
+++ ruby_1_8/version.h	(revision 20016)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-10-23"
+#define RUBY_RELEASE_DATE "2008-10-29"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081023
+#define RUBY_RELEASE_CODE 20081029
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 20015)
+++ ruby_1_9_1/configure.in	(revision 20016)
@@ -1253,7 +1253,13 @@
 AC_ARG_WITH(dln-a-out, 
 	[  --with-dln-a-out        use dln_a_out if possible], [
 	case $withval in
-	yes) with_dln_a_out=yes;;
+	dnl (
+	yes)
+	    if test "$enable_shared" = yes; then
+		AC_MSG_ERROR(dln_a_out can not make shared library)
+	    fi
+	    with_dln_a_out=yes;;
+	dnl (
 	*)   with_dln_a_out=no;;
 	esac], [with_dln_a_out=no])
 
@@ -1271,6 +1277,9 @@
 
 if test "$rb_cv_binary_elf" = yes; then
   AC_DEFINE(USE_ELF)
+  if test "$with_dln_a_out" = yes; then
+    AC_MSG_ERROR(dln_a_out does not work with ELF)
+  fi
 fi
 
 case "$target_os" in
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20015)
+++ ruby_1_9_1/ChangeLog	(revision 20016)
@@ -1,3 +1,8 @@
+Wed Oct 29 11:50:57 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (dln-a-out): cannot make shared library nor work with
+	  ELF.  [ruby-core:19571]
+
 Wed Oct 29 11:01:46 2008  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_open): shouldn't seek here.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/