From 40aa4ce487b89f2d63decf2b552ca2aff0ec9957 Mon Sep 17 00:00:00 2001 From: knu Date: Mon, 4 Mar 2002 04:24:26 +0000 Subject: * ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where --with-xx-{include,lib} is ignored when --with-xx-dir is specified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/extmk.rb.in | 18 +++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac39ef2d32..d91da85c82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 4 13:23:16 2002 Akinori MUSHA + + * ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where + --with-xx-{include,lib} is ignored when --with-xx-dir is + specified. + Fri Mar 1 23:08:16 2002 Yukihiro Matsumoto * stable version 1.6.7 released. diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index dd9b51dbfd..94f4ea657b 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -338,21 +338,13 @@ def create_header() end def dir_config(target, idefault=nil, ldefault=nil) - if idefault && ldefault == nil - default = idefault - idefault = default + "/include" - ldefault = default + "/lib" + if dir = with_config(target + "-dir", (idefault unless ldefault)) + idefault = dir + "/include" + ldefault = dir + "/lib" end - dir = with_config(target + "-dir", default) - - idir, ldir = if dir then [ - dir + "/include", - dir + "/lib" - ] else [ - with_config(target + "-include", idefault), - with_config(target + "-lib", ldefault) - ] end + idir = with_config(target + "-include", idefault) + ldir = with_config(target + "-lib", ldefault) if idir idircflag = "-I" + idir -- cgit v1.2.3