From ruby-ext-admin@netlab.co.jp  Thu Aug 17 20:57:06 2000
Received: from voscc.nagaokaut.ac.jp (voscc.nagaokaut.ac.jp [133.44.1.100])
	by blade.nagaokaut.ac.jp (8.8.8/8.8.8/Debian/GNU) with ESMTP id UAA32651;
	Thu, 17 Aug 2000 20:57:06 +0900
Received: from hoyogw.netlab.co.jp (postfix@hoyogw.netlab.co.jp [210.251.121.20])
	by voscc.nagaokaut.ac.jp (8.9.3/3.7W) id UAA97127;
	Thu, 17 Aug 2000 20:57:10 +0900 (JST)
Received: from hoyogw.netlab.co.jp (localhost [127.0.0.1])
	by hoyogw.netlab.co.jp (Postfix) with ESMTP
	id 1EE3046D0B; Thu, 17 Aug 2000 20:57:08 +0900 (JST)
Delivered-To: ruby-ext@netlab.co.jp
Date: Thu, 17 Aug 2000 20:56:32 +0900
From: "Akinori -Aki- MUSHA" <knu@idaemons.org>
Reply-To: ruby-ext@netlab.co.jp
Subject: [ruby-ext:01174] dir_config
To: ruby-ext@netlab.co.jp (ruby-ext ML)
Message-Id: <86pun8cd8v.wl@localhost.local.idaemons.org>
X-ML-Name: ruby-ext
X-Mail-Count: 01174
X-MLServer: fml [fml 3.0pl#17]; post only (only members can post)
X-ML-Info: If you have a question, send e-mail with the body
	"help" (without quotes) to the address ruby-ext-ctl@netlab.co.jp;
	help=<mailto:ruby-ext-ctl@netlab.co.jp?body=help>
User-Agent: Wanderlust/2.3.0 (Roam) EMIKO/1.13.12 (Euglena sociabilis) FLIM/1.13.2 (Kasanui) APEL/10.2 MULE XEmacs/21.1 (patch 11) (Carlsbad Caverns) (i386--freebsd)
Organization: Associated I. Daemons
X-PGP-Public-Key: finger knu@FreeBSD.org
X-PGP-Fingerprint: 081D 099C 1705 861D 4B70  B04A 920B EFC7 9FD9 E1EE
X-PGP-Comment: I changed my key on 2000-08-10
Mime-Version: 1.0 (generated by EMIKO 1.13.12 - "Euglena sociabilis")
Content-Type: text/plain; charset=ISO-2022-JP
Precedence: bulk
Lines: 83
Sender: ruby-ext-admin@netlab.co.jp

　mkmf.rb の dir_config が arg_config/with_config/enable_config の
ようにデフォルト値を受け付けるようにしてみました。

　引数一つのときは --with-*-dir のデフォルト値、二つのときは順に
--with-*-include, --with-*-lib のデフォルト値扱いになります。

　よかったら取り込んでください。


使用例:

# e.g. --with-x-dir=/usr/X11R6.4
dir_config('x', '/usr/X11R6')

# e.g. --with-qt-dir=/usr/lib/qt
dir_config('qt', '/usr/X11R6/include/X11/qt', '/usr/X11R6/lib')


Index: mkmf.rb
===================================================================
RCS file: /home/ruby/cvs/ruby/lib/mkmf.rb,v
retrieving revision 1.28
diff -u -c -r1.28 mkmf.rb
*** mkmf.rb	2000/08/09 04:32:23	1.28
--- mkmf.rb	2000/08/17 11:14:11
***************
*** 313,335 ****
    end
  end
  
! def dir_config(target)
    dir = with_config("%s-dir"%target)
    if dir
!     idir = " -I"+dir+"/include"
!     ldir = " -L"+dir+"/lib"
!   end
!   unless idir
!     dir = with_config("%s-include"%target)
!     idir = " -I"+dir if dir
!   end
!   unless ldir
!     dir = with_config("%s-lib"%target)
!     ldir = " -L"+dir if dir
    end
  
!   $CFLAGS += idir if idir
!   $LDFLAGS += ldir if ldir
  end
  
  def create_makefile(target)
--- 313,334 ----
    end
  end
  
! def dir_config(target, *default)
!   if default.length == 1
!     default = [default[0]+"/include", default[0]+"/lib"]
!   end
! 
    dir = with_config("%s-dir"%target)
    if dir
!     idir = dir+"/include"
!     ldir = dir+"/lib"
!   else
!     idir = with_config("%s-include"%target, default[0])
!     ldir = with_config("%s-lib"%target, default[1])
    end
  
!   $CFLAGS  += " -I"+idir if idir
!   $LDFLAGS += " -L"+ldir if ldir
  end
  
  def create_makefile(target)


-- 
                           /
                          /__  __       
                         / )  )  ) )  /
Akinori -Aki- MUSHA aka / (_ /  ( (__(  @ idaemons.org / FreeBSD.org

"We're only at home when we're on the run, on the wing, on the fly"