diff --git a/ChangeLog b/ChangeLog
index 189e37ef5b..03924d6159 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 20 19:53:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/digest/sha2/extconf.rb: fix support for cross-compiling.
+
+	* mkconfig.rb: fix support for autoconf 2.52.
+
 Mon Aug 20 15:14:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (tokadd_escape): escaped backslashes too much.
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index f593c79111..c982aa64de 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -17,18 +17,12 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-if try_run(<<SRC, $defs.join(' '))
+if try_cpp(<<SRC, $defs.join(' '))
 #include "defs.h"
-int main(void) {
 #ifdef NO_UINT64_T
-    return 1;
-#else
-    return 0;
+  #error ** Cannot find a 64bit integer type - skipping the SHA2 module.
 #endif
-}
 SRC
 then
   create_makefile("digest/sha2")
-else
-  puts "** Cannot find a 64bit integer type - skipping the SHA2 module."
 end
diff --git a/mkconfig.rb b/mkconfig.rb
index e19925bc52..5107ef69d7 100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -28,7 +28,7 @@ has_srcdir = false
 has_version = false
 File.foreach "config.status" do |line|
   next if /^#/ =~ line
-  if /^s[%,]@program_transform_name@[%,]s,(.*)[%,]/ =~ line
+  if /^s[%,]@program_transform_name@[%,]s,(.*)/ =~ line
     next if $install_name
     ptn = $1.sub(/\$\$/, '$').split(/,/)	#'
     v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + "ruby".sub(ptn[0],ptn[1]) + "\"\n"