diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/etc/extconf.rb | 46 |
2 files changed, 27 insertions, 23 deletions
@@ -1,3 +1,7 @@ +Wed Apr 23 20:36:22 2014 Tanaka Akira <akr@fsij.org> + + * ext/etc/extconf.rb: Build ext/etc unconditionally. + Wed Apr 23 14:10:50 2014 NARUSE, Yui <naruse@ruby-lang.org> * file.c (statfs_fsid): remove statfs.f_fsid because it doesn't return 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") |