From 852b80d92af66f0d53fb89bdfd2c93834e434c69 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Fri, 8 Sep 2006 02:36:51 +0000
Subject: Move back CONFIGURE_ARGS part from rubyversion.mk to Makefile.common.

---
 lang/ruby/Makefile.common |  8 +++++++-
 lang/ruby/rubyversion.mk  | 11 ++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common
index 400e558078b..afba2c7187a 100644
--- a/lang/ruby/Makefile.common
+++ b/lang/ruby/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2006/09/07 15:40:00 taca Exp $
+# $NetBSD: Makefile.common,v 1.12 2006/09/08 02:36:51 taca Exp $
 #
 # Ruby base distribution common definition
 
@@ -40,3 +40,9 @@ PLIST_SUBST+=		RUBY_SHLIBVER=${RUBY_SHLIBVER:Q} \
 			RUBY_NAME=${RUBY_NAME:Q}
 
 .include "replace.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+CONFIGURE_ARGS+=	--disable-pthread
+.else
+CONFIGURE_ARGS+=	--enable-pthread
+.endif
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index d32affad301..deedf4685e1 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.23 2006/09/07 15:40:00 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.24 2006/09/08 02:36:51 taca Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -260,16 +260,9 @@ RUBY_GENERATE_PLIST =	( \
 
 .if !empty(RUBY_NOVERSION:M[nN][oO])
 # Common macros.
-.if ${OPSYS} == "NetBSD"
-.if empty(OS_VERSION:M1.[0-9].*)
+.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M1.[0-9].*)
 PTHREAD_OPTS+=  native
 .include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+=	--disable-pthread
-.else
-CONFIGURE_ARGS+=	--enable-pthread
-.endif
-.endif
 .endif
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-- 
cgit v1.2.3