From 2ebfc7e32819f1a1bc79852f5e3905c13432c299 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 30 Aug 2004 06:16:29 +0000
Subject: * configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD.
 [ruby-dev:24051]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  4 ++++
 configure.in | 18 +++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3987d71fea..81ea9c2965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug 30 15:10:46 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
+
 Sun Aug 29 14:08:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
diff --git a/configure.in b/configure.in
index 89a9ba8068..b82c6b19bd 100644
--- a/configure.in
+++ b/configure.in
@@ -792,7 +792,7 @@ if test "$rb_cv_binary_elf" = yes; then
 fi
 
 case "$target_os" in
-linux*)
+linux* | gnu* | k*bsd*-gnu)
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
     else
@@ -873,15 +873,13 @@ if test "$with_dln_a_out" != yes; then
 			rb_cv_dlopen=yes ;;
 	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
 			rb_cv_dlopen=yes ;;
-	linux*) 	: ${LDSHARED="$CC -shared"}
+	linux* | gnu* | k*bsd*-gnu)
+		 	: ${LDSHARED="$CC -shared"}
 			rb_cv_dlopen=yes ;;
 	interix*) 	: ${LDSHARED="$CC -shared"}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
 			LIBPATHFLAG=" -L'%1\$-s'"
 			rb_cv_dlopen=yes ;;
-	gnu*)   	: ${LDSHARED="$CC -shared"}
-			rb_cv_dlopen=yes
-			LDFLAGS="$LDFLAGS -rdynamic" ;;
 	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -rdynamic"
@@ -1031,9 +1029,7 @@ else
 fi
 
 case "$target_os" in
-  linux*)
-	STRIP='strip -S -x';;
-  gnu*)
+  linux* | gnu* | k*bsd*-gnu)
 	STRIP='strip -S -x';;
   nextstep*)
 	STRIP='strip -A -n';;
@@ -1179,11 +1175,7 @@ if test "$enable_shared" = 'yes'; then
     sunos4*)
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
-    linux*)
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	;;
-    gnu*)
+    linux* | gnu* | k*bsd*-gnu)
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
-- 
cgit v1.2.3