* ext/extmk.rb (extract_makefile): extract previously collected

  informations from existing Makefile.

* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]

* ext/tk/extconf.rb: separate tkutil configuration.

* lib/mkmf.rb ($extmk): check if under ext directory.

* lib/mkmf.rb (Logging.postpone): allow recursive operation.

* lib/mkmf.rb (try_constant): make sure if really a constant, reduce
  the number of times of compile.

* lib/mkmf.rb (have_macro, have_var, byte_order): new functions.

* lib/mkmf.rb (find_library): allow directory list with separators.

* lib/mkmf.rb (arg_config): manage provided configuration options.

* lib/mkmf.rb (dir_config): accept arrays of directory names as
  default values.


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

1 files changed, 1 insertions, 39 deletions

diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index a677ea3a7c..30dd11ab86 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -265,52 +265,14 @@ if mac_need_framework ||
     $LDFLAGS += ' -framework Tk -framework Tcl'
   end
 
-
   if stubs or pthread_check
     # create Makefile
 
-    # backup
-    if $INSTALLFILES
-      installfiles_bup = $INSTALLFILES.dup
-    else
-      installfiles_bup = nil
-      $INSTALLFILES = []
-    end
-
     # for SUPPORT_STATUS
+    $INSTALLFILES ||= []
     $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
 
     # create
     create_makefile("tcltklib")
-
-    # reset
-    $INSTALLFILES = installfiles_bup
-
-    # add rules for tkutil
-    File::open('Makefile', 'a'){|mfile|
-      File::open('make-tkutil', 'r'){|dfile|
-        mfile.print "\n###\n"
-        while line = dfile.gets()
-          mfile.print line
-        end
-      }
-    }
-
-    # create tkutil/Makefile
-    Dir.chdir 'tkutil'
-    if $extout || $extmk
-      $srcdir = '../' << $srcdir << '/tkutil'
-      $topdir = '../' << $topdir
-      $hdrdir = '../' << $hdrdir
-      $objs = nil
-      $defs = []
-      Config::CONFIG["srcdir"] = $srcdir
-    else
-      puts "entering directory `tkutil'"
-    end
-    rm_f './Makefile'
-    init_mkmf
-    load 'subconf.rb'
-    Dir.chdir '..'
   end
 end