* configure.in (dln-a-out): cannot make shared library nor work with

  ELF.  [ruby-core:19571]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 18 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 94c107cdb9..0da39a8ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 29 11:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/mkmf.rb (create_tmpsrc): get rid of side effects.
diff --git a/configure.in b/configure.in
index 7612c40ca2..9cafbe87da 100644
--- a/configure.in
+++ b/configure.in
@@ -1094,7 +1094,13 @@ dnl wheather use dln_a_out or not
 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 @@ rb_cv_binary_elf=no)])
 
 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
diff --git a/version.h b/version.h
index 8434dc73d7..93319711fa 100644
--- a/version.h
+++ b/version.h
@@ -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[];