* Makefile.in, configure.in: made EXTOUT configurable.

* ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style.

* lib/mkmf.rb: make extensions in depth order.  [ruby-dev:25522]


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

ChangeLog

@@ -1,3 +1,11 @@
+Tue Feb  1 00:19:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, configure.in: made EXTOUT configurable.
+
+	* ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style.
+
+	* lib/mkmf.rb: make extensions in depth order.  [ruby-dev:25522]
+
 Mon Jan 31 13:16:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/extconf.rb: add tkutil configuration step (remove old schema)
@@ -105,7 +113,7 @@ Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
 
-	* ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for 
+	* ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
 	  a command argument [ruby-dev:25479]
 
 	* ext/tk/lib/multi-tk.rb: ditto

Makefile.in

@@ -27,7 +27,7 @@ TESTUI = console
 TESTS =
 RDOCTARGET = @RDOCTARGET@
 
-EXTOUT = .ext
+EXTOUT = @EXTOUT@
 RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
 
 OUTFLAG = -o 

configure.in

@@ -1101,6 +1101,7 @@ fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
 AC_SUBST(RUNRUBY)
+AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'

ext/extmk.rb

@@ -82,6 +82,7 @@ def extmake(target)
 	$defs = []
 	Logging::logfile 'mkmf.log'
 	Config::CONFIG["srcdir"] = $srcdir
+	Config::CONFIG["topdir"] = $topdir
 	rm_f makefile
 	begin
 	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
@@ -317,7 +318,7 @@ exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
   d = File.dirname(d)
   d.slice!(0, ext_prefix.length + 1)
   d
-} unless $extension
+}.sort unless $extension
 
 if $extout
   Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))

lib/mkmf.rb

@@ -1062,8 +1062,12 @@ end
 Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
   $srcdir = arg_config("--srcdir", File.dirname($0))
 $configure_args["--topsrcdir"] ||= $srcdir
-Config::CONFIG["topdir"] = CONFIG["topdir"] =
-  $curdir = arg_config("--curdir", Dir.pwd)
+$curdir = arg_config("--curdir", Dir.pwd)
+Config.expand(curdir = $curdir.dup)
+unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
+  CONFIG["topdir"] = $curdir
+  Config::CONFIG["topdir"] = curdir
+end
 $configure_args["--topdir"] ||= $curdir
 $ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"]))