diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-07 02:44:07 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-07 02:44:07 +0000 |
commit | 7c93e565600f3645659e603161c9ac992184c7d0 (patch) | |
tree | 4a5f6b9d268d4ca8786297c98ef162042a1a6f8f | |
parent | 0c0f9873760236083a003a70b668fb1ea3473bfa (diff) | |
download | ruby-7c93e565600f3645659e603161c9ac992184c7d0.tar.gz |
* lib/mkmf.rb (have_header): needs dependent headers if trying to
compile.
* ext/socket/extconf.rb: net/if.h depends on other headers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/socket/extconf.rb | 2 | ||||
-rw-r--r-- | lib/mkmf.rb | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Sat Feb 7 11:44:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (have_header): needs dependent headers if trying to + compile. + + * ext/socket/extconf.rb: net/if.h depends on other headers. + Sat Feb 7 04:02:37 2009 Tanaka Akira <akr@fsij.org> * dir.c (dir_read): don't disable rdoc. diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 63a8577c2e..a0a4f8e9f7 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -291,7 +291,7 @@ have_header("ifaddrs.h") have_func("getifaddrs") have_header("sys/ioctl.h") have_header("sys/sockio.h") -have_header("net/if.h") +have_header("net/if.h", headers) unless have_type("socklen_t", headers) $defs << "-Dsocklen_t=int" diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 2cbbb245a9..2a49b6fc8f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -808,9 +808,9 @@ end # For example, if have_header('foo.h') returned true, then the HAVE_FOO_H # preprocessor macro would be passed to the compiler. # -def have_header(header, &b) +def have_header(header, preheaders = nil, &b) checking_for header do - if try_header(cpp_include(header), &b) + if try_header(cpp_include(preheaders)+cpp_include(header), &b) $defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___"))) true else |