akr	2014-04-23 20:53:07 +0900 (Wed, 23 Apr 2014)

  New Revision: 45692

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45692

  Log:
    * ext/etc/extconf.rb: Build ext/etc unconditionally.

  Modified files:
    trunk/ChangeLog
    trunk/ext/etc/extconf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 45691)
+++ ChangeLog	(revision 45692)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Apr 23 20:36:22 2014  Tanaka Akira  <akr@f...>
+
+	* ext/etc/extconf.rb: Build ext/etc unconditionally.
+
 Wed Apr 23 14:10:50 2014  NARUSE, Yui  <naruse@r...>
 
 	* file.c (statfs_fsid): remove statfs.f_fsid because it doesn't return
Index: ext/etc/extconf.rb
===================================================================
--- ext/etc/extconf.rb	(revision 45691)
+++ ext/etc/extconf.rb	(revision 45692)
@@ -1,30 +1,30 @@ https://github.com/ruby/ruby/blob/trunk/ext/etc/extconf.rb#L1
 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")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/