Skip to content

Commit fcee10c

Browse files
committed
build: remove SSL lib detection
1 parent c7f30db commit fcee10c

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

configure.ac

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,6 @@ if test x$use_pkgconfig = xyes; then
12401240
m4_ifdef(
12411241
[PKG_CHECK_MODULES],
12421242
[
1243-
PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl not found.)])
12441243
PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
12451244
if test x$use_qr != xno; then
12461245
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
@@ -1267,9 +1266,6 @@ else
12671266
AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing))
12681267
AC_CHECK_LIB([crypto], [main],CRYPTO_LIBS=-lcrypto, AC_MSG_ERROR(libcrypto missing))
12691268

1270-
AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
1271-
AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing))
1272-
12731269
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
12741270
AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
12751271
AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
@@ -1596,7 +1592,6 @@ AC_SUBST(LEVELDB_TARGET_FLAGS)
15961592
AC_SUBST(MINIUPNPC_CPPFLAGS)
15971593
AC_SUBST(MINIUPNPC_LIBS)
15981594
AC_SUBST(CRYPTO_LIBS)
1599-
AC_SUBST(SSL_LIBS)
16001595
AC_SUBST(EVENT_LIBS)
16011596
AC_SUBST(EVENT_PTHREADS_LIBS)
16021597
AC_SUBST(ZMQ_LIBS)

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
LIBUNIVALUE = $(UNIVALUE_LIBS)
2020
endif
2121

22-
BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
22+
BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS)
2323

2424
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
2525
BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)

0 commit comments

Comments
 (0)