summaryrefslogtreecommitdiff
path: root/ext/digest/md5
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-11 02:08:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-11 02:08:50 +0000
commitb632ca436c5d06defc87df8b2a4774680e9cf6ef (patch)
treef0dbdd200af40ee8c337f9c8a069487e59e85918 /ext/digest/md5
parente5c516c89a62839fd025ae112041ed9a5f06c9d0 (diff)
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/md5')
-rw-r--r--ext/digest/md5/extconf.rb12
-rw-r--r--ext/digest/md5/md5init.c2
2 files changed, 3 insertions, 11 deletions
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index dbef0878ca3..5140325b8f0 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -3,22 +3,14 @@
# $Id$
require "mkmf"
+require File.expand_path("../../digest_conf", __FILE__)
$defs << "-DHAVE_CONFIG_H"
$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "md5init.#{$OBJEXT}" ]
-if !with_config("bundled-md5") &&
- (dir_config("openssl")
- pkg_config("openssl")
- require File.expand_path('../../../openssl/deprecation', __FILE__)
- have_library("crypto")) &&
- OpenSSL.check_func("MD5_Transform", "openssl/md5.h")
- $objs << "md5ossl.#{$OBJEXT}"
-else
- $objs << "md5.#{$OBJEXT}"
-end
+digest_conf("md5")
have_header("sys/cdefs.h")
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 433fbbd2502..93d01a2f41f 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -2,7 +2,7 @@
/* $Id$ */
#include "digest.h"
-#if defined(HAVE_OPENSSL_MD5_H)
+#if defined(MD5_USE__OPENSSL)
#include "md5ossl.h"
#else
#include "md5.h"