summaryrefslogtreecommitdiff
path: root/ext/digest/sha1
diff options
context:
space:
mode:
Diffstat (limited to 'ext/digest/sha1')
-rw-r--r--ext/digest/sha1/extconf.rb12
-rw-r--r--ext/digest/sha1/sha1init.c2
2 files changed, 3 insertions, 11 deletions
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index c230270e1b4..7528fb2de31 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 bb4af1c1c26..72529fe0b76 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"