nobu	2013-02-25 13:12:45 +0900 (Mon, 25 Feb 2013)

  New Revision: 39486

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

  Log:
    configure.in: find Setup file automatically
    
    * configure.in (setup): find Setup file from target_os 1. by
      suffix (e.g. Setup.nacl, Setup.atheos), 2. by "platform"
      option (e.g. Setup.nt, Setup.emx), and 3. default Setup.  And
      Setup.dj had been removed.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/ext/Setup.emx
    trunk/ext/Setup.nt

Index: configure.in
===================================================================
--- configure.in	(revision 39485)
+++ configure.in	(revision 39486)
@@ -2580,21 +2580,22 @@ fi https://github.com/ruby/ruby/blob/trunk/configure.in#L2580
 AC_SUBST(ENCOBJS)
 AC_SUBST(EXTOBJS)
 
-AS_CASE(["$target_os"],
-  dnl OS/2 environment w/ Autoconf 2.1x for EMX
-  [os2-emx], [
-    setup=Setup.emx
-    ],
-  [*djgpp*], [
-    setup=Setup.dj
-    ],
-  [nacl], [
-    setup=Setup.nacl
-    ],
-  [
-    setup=Setup
-    ])
-
+if test -f "$srcdir/ext/Setup.$target_os"; then
+    setup="Setup.$target_os"
+else
+    setup=
+    for file in "$srcdir"/ext/Setup.*; do
+	AS_CASE(["$file"], [*~|*.bak|*.orig|*.rej|*.tmp], [continue])
+	setup=`basename "$file"`
+	AS_CASE(["$target_os"], [`expr "$setup" : 'Setup.\(.*\)'`*], [break])
+	platform=`sed '/^option  *platform  */!d;s///;s/|/*|/g;q' "$file"`
+	if test "x$platform" != x; then
+	    eval "AS_CASE([\"\$target_os\"], [$platform*], [break])"
+	fi
+	setup=
+    done
+    : ${setup:=Setup}
+fi
 AC_SUBST(setup)
 
 test x"$prefix" = xNONE && prefix=$ac_default_prefix
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39485)
+++ ChangeLog	(revision 39486)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Feb 25 13:12:39 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (setup): find Setup file from target_os 1. by
+	  suffix (e.g. Setup.nacl, Setup.atheos), 2. by "platform"
+	  option (e.g. Setup.nt, Setup.emx), and 3. default Setup.  And
+	  Setup.dj had been removed.
+
 Mon Feb 25 12:48:00 2013  Zachary Scott  <zachary@z...>
 
 	* thread.c: Document Thread::new, clean up ::fork and mention calling
Index: ext/Setup.nt
===================================================================
--- ext/Setup.nt	(revision 39485)
+++ ext/Setup.nt	(revision 39486)
@@ -1,3 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/Setup.nt#L1
+option platform cygwin|mingw|mswin
 #option nodynamic
 
 Win32API
Index: ext/Setup.emx
===================================================================
--- ext/Setup.emx	(revision 39485)
+++ ext/Setup.emx	(revision 39486)
@@ -1,3 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/Setup.emx#L1
+# OS/2 environment w/ Autoconf 2.1x for EMX
+option platform os2-emx
 option nodynamic
 
 #Win32API

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