diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-08-20 10:56:03 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-08-20 10:56:03 +0000 |
| commit | e15efe7733f5e6e9377ae1bd2fc5f6029c919f1d (patch) | |
| tree | 909bd2bee333bdd9ac96c826838879d1e06a98eb | |
| parent | ba294ad0601e84a4c64e31ac03bebf5e964c3029 (diff) | |
* ext/digest/sha2/extconf.rb: fix support for cross-compiling.
* mkconfig.rb: fix support for autoconf 2.52.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/digest/sha2/extconf.rb | 10 | ||||
| -rw-r--r-- | mkconfig.rb | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -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" |