diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-11 02:08:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-11 02:08:50 +0000 |
| commit | b632ca436c5d06defc87df8b2a4774680e9cf6ef (patch) | |
| tree | f0dbdd200af40ee8c337f9c8a069487e59e85918 /ext/digest/sha1 | |
| parent | e5c516c89a62839fd025ae112041ed9a5f06c9d0 (diff) | |
| download | ruby-b632ca436c5d06defc87df8b2a4774680e9cf6ef.tar.gz | |
digest: common configurations
* ext/digest/digest_conf.rb (digest_conf): extract common
configurations.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/digest/sha1')
| -rw-r--r-- | ext/digest/sha1/extconf.rb | 12 | ||||
| -rw-r--r-- | ext/digest/sha1/sha1init.c | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb index c230270e1b..7528fb2de3 100644 --- a/ext/digest/sha1/extconf.rb +++ b/ext/digest/sha1/extconf.rb @@ -3,22 +3,14 @@ # $Id$ require "mkmf" +require File.expand_path("../../digest_conf", __FILE__) $defs << "-DHAVE_CONFIG_H" $INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha1init.#{$OBJEXT}" ] -if !with_config("bundled-sha1") && - (dir_config("openssl") - pkg_config("openssl") - require File.expand_path('../../../openssl/deprecation', __FILE__) - have_library("crypto")) && - OpenSSL.check_func("SHA1_Transform", "openssl/sha.h") - $objs << "sha1ossl.#{$OBJEXT}" -else - $objs << "sha1.#{$OBJEXT}" -end +digest_conf("sha1", "sha") have_header("sys/cdefs.h") diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c index bb4af1c1c2..72529fe0b7 100644 --- a/ext/digest/sha1/sha1init.c +++ b/ext/digest/sha1/sha1init.c @@ -2,7 +2,7 @@ /* $Id$ */ #include "digest.h" -#if defined(HAVE_OPENSSL_SHA_H) +#if defined(SHA1_USE_OPENSSL) #include "sha1ossl.h" #else #include "sha1.h" |