diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-23 11:53:07 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-23 11:53:07 +0000 |
| commit | 708e1bd49db643c66deef21d05d92e5ac9e31007 (patch) | |
| tree | baf38d281d7687b16088bb9efb9c324655218f19 /ext/etc | |
| parent | 474e9869ef506776cfde8eb413605cec0a59c33c (diff) | |
| download | ruby-708e1bd49db643c66deef21d05d92e5ac9e31007.tar.gz | |
* ext/etc/extconf.rb: Build ext/etc unconditionally.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/etc')
| -rw-r--r-- | ext/etc/extconf.rb | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb index 1967560cd4..c26553e71a 100644 --- a/ext/etc/extconf.rb +++ b/ext/etc/extconf.rb @@ -1,30 +1,30 @@ require 'mkmf' have_library("sun", "getpwnam") # NIS (== YP) interface for IRIX 4 -a = have_func("getlogin") -b = have_func("getpwent") -c = have_func("getgrent") +have_func("getlogin") +have_func("getpwent") +have_func("getgrent") sysconfdir = RbConfig.expand(RbConfig::CONFIG["sysconfdir"].dup, "prefix"=>"", "DESTDIR"=>"") $defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}") -if a or b or c or sysconfdir - have_struct_member('struct passwd', 'pw_gecos', 'pwd.h') - have_struct_member('struct passwd', 'pw_change', 'pwd.h') - have_struct_member('struct passwd', 'pw_quota', 'pwd.h') - if have_struct_member('struct passwd', 'pw_age', 'pwd.h') - case what_type?('struct passwd', 'pw_age', 'pwd.h') - when "string" - f = "safe_setup_str" - when "long long" - f = "LL2NUM" - else - f = "INT2NUM" - end - $defs.push("-DPW_AGE2VAL="+f) + +have_struct_member('struct passwd', 'pw_gecos', 'pwd.h') +have_struct_member('struct passwd', 'pw_change', 'pwd.h') +have_struct_member('struct passwd', 'pw_quota', 'pwd.h') +if have_struct_member('struct passwd', 'pw_age', 'pwd.h') + case what_type?('struct passwd', 'pw_age', 'pwd.h') + when "string" + f = "safe_setup_str" + when "long long" + f = "LL2NUM" + else + f = "INT2NUM" end - have_struct_member('struct passwd', 'pw_class', 'pwd.h') - have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM - have_struct_member('struct passwd', 'pw_expire', 'pwd.h') - have_struct_member('struct passwd', 'pw_passwd', 'pwd.h') - have_struct_member('struct group', 'gr_passwd', 'grp.h') - create_makefile("etc") + $defs.push("-DPW_AGE2VAL="+f) end +have_struct_member('struct passwd', 'pw_class', 'pwd.h') +have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM +have_struct_member('struct passwd', 'pw_expire', 'pwd.h') +have_struct_member('struct passwd', 'pw_passwd', 'pwd.h') +have_struct_member('struct group', 'gr_passwd', 'grp.h') + +create_makefile("etc") |