This detects libcrypto for OpenSSL 0.9.8, 1.0 and 1.1.
Furthermore, curve detection appeared broken on Arch Linux, this is fixed
with the addition of PDNS_CHECK_LIBCRYPTO_ECDSA, without breaking on Debian
Jessie, Ubuntu Trusty, Wily and Xenial and CentOS 5 through 7.
PDNS_ENABLE_BOTAN
PDNS_CHECK_LIBSODIUM
PDNS_ENABLE_BOTAN
PDNS_CHECK_LIBSODIUM
- AC_MSG_ERROR([OpenSSL not found])
+ AC_MSG_ERROR([OpenSSL/libcrypto not found])
+PDNS_CHECK_LIBCRYPTO_ECDSA
PDNS_CHECK_RAGEL
PDNS_CHECK_CLOCK_GETTIME
PDNS_CHECK_RAGEL
PDNS_CHECK_CLOCK_GETTIME
AC_MSG_NOTICE([Built-in modules: $modules])
AC_MSG_NOTICE([Dynamic modules: $dynmodules])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Built-in modules: $modules])
AC_MSG_NOTICE([Dynamic modules: $dynmodules])
AC_MSG_NOTICE([])
-AS_IF([test "x$openssl_ecdsa" = "xyes"],
+AS_IF([test "x$libcrypto_ecdsa" == "xyes"],
[AC_MSG_NOTICE([OpenSSL ecdsa: yes])],
[AC_MSG_NOTICE([OpenSSL ecdsa: no])]
)
[AC_MSG_NOTICE([OpenSSL ecdsa: yes])],
[AC_MSG_NOTICE([OpenSSL ecdsa: no])]
)
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html
-# ===========================================================================
-#
-# AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]])
+# PDNS_CHECK_LIBCRYPTO([action-if-found[, action-if-not-found]])
-# Look for OpenSSL in a number of default spots, or in a user-selected
-# spot (via --with-openssl). Sets
+# Look for OpenSSL's libcrypto in a number of default spots, or in a
+# user-selected spot (via --with-libcrypto). Sets
-# OPENSSL_INCLUDES to the include directives required
-# OPENSSL_LIBS to the -l directives required
-# OPENSSL_LDFLAGS to the -L or -R flags required
+# LIBCRYPTO_INCLUDES to the include directives required
+# LIBCRYPTO_LIBS to the -l directives required
+# LIBCRYPTO_LDFLAGS to the -L or -R flags required
#
# and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately
#
#
# and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately
#
-# This macro sets OPENSSL_INCLUDES such that source files should use the
+# This macro sets LIBCRYPTO_INCLUDES such that source files should use the
# openssl/ directory in include directives:
#
# #include <openssl/hmac.h>
#
# LICENSE
#
# openssl/ directory in include directives:
#
# #include <openssl/hmac.h>
#
# LICENSE
#
+# Taken and modified from AX_CHECK_OPENSSL by:
# Copyright (c) 2009,2010 Zmanda Inc. <http://www.zmanda.com/>
# Copyright (c) 2009,2010 Dustin J. Mitchell <dustin@zmanda.com>
#
# Copyright (c) 2009,2010 Zmanda Inc. <http://www.zmanda.com/>
# Copyright (c) 2009,2010 Dustin J. Mitchell <dustin@zmanda.com>
#
# and this notice are preserved. This file is offered as-is, without any
# warranty.
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 8 (PowerDNS modified)
-AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
-AC_DEFUN([AX_CHECK_OPENSSL], [
+AU_ALIAS([CHECK_LIBCRYPTO], [PDNS_CHECK_LIBCRYPTO])
+AC_DEFUN([PDNS_CHECK_LIBCRYPTO], [
- AC_ARG_WITH([openssl],
- [AS_HELP_STRING([--with-openssl=DIR],
+ AC_ARG_WITH([libcrypto],
+ [AS_HELP_STRING([--with-libcrypto=DIR],
[root of the OpenSSL directory])],
[
case "$withval" in
"" | y | ye | yes | n | no)
[root of the OpenSSL directory])],
[
case "$withval" in
"" | y | ye | yes | n | no)
- AC_MSG_ERROR([Invalid --with-openssl value])
+ AC_MSG_ERROR([Invalid --with-libcrypto value])
;;
*) ssldirs="$withval"
;;
;;
*) ssldirs="$withval"
;;
], [
# if pkg-config is installed and openssl has installed a .pc file,
# then use that information and don't search ssldirs
], [
# if pkg-config is installed and openssl has installed a .pc file,
# then use that information and don't search ssldirs
- AC_PATH_PROG([PKG_CONFIG], [pkg-config])
+ AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
if test x"$PKG_CONFIG" != x""; then
if test x"$PKG_CONFIG" != x""; then
- OPENSSL_LDFLAGS=`$PKG_CONFIG libcrypto --libs-only-L 2>/dev/null`
+ LIBCRYPTO_LDFLAGS=`$PKG_CONFIG libcrypto --libs-only-L 2>/dev/null`
- OPENSSL_LIBS=`$PKG_CONFIG libcrypto --libs-only-l 2>/dev/null`
- OPENSSL_INCLUDES=`$PKG_CONFIG libcrypto --cflags-only-I 2>/dev/null`
+ LIBCRYPTO_LIBS=`$PKG_CONFIG libcrypto --libs-only-l 2>/dev/null`
+ LIBCRYPTO_INCLUDES=`$PKG_CONFIG libcrypto --cflags-only-I 2>/dev/null`
# an 'openssl' subdirectory
if ! $found; then
# an 'openssl' subdirectory
if ! $found; then
for ssldir in $ssldirs; do
AC_MSG_CHECKING([for openssl/crypto.h in $ssldir])
if test -f "$ssldir/include/openssl/crypto.h"; then
for ssldir in $ssldirs; do
AC_MSG_CHECKING([for openssl/crypto.h in $ssldir])
if test -f "$ssldir/include/openssl/crypto.h"; then
- OPENSSL_INCLUDES="-I$ssldir/include"
- OPENSSL_LDFLAGS="-L$ssldir/lib"
- OPENSSL_LIBS="-lcrypto"
+ LIBCRYPTO_INCLUDES="-I$ssldir/include"
+ LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
+ LIBCRYPTO_LIBS="-lcrypto"
found=true
AC_MSG_RESULT([yes])
break
found=true
AC_MSG_RESULT([yes])
break
# try the preprocessor and linker with our new flags,
# being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
# try the preprocessor and linker with our new flags,
# being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
- AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
- echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
- "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
+ AC_MSG_CHECKING([whether compiling and linking against OpenSSL's libcrypto works])
+ echo "Trying link with LIBCRYPTO_LDFLAGS=$LIBCRYPTO_LDFLAGS;" \
+ "LIBCRYPTO_LIBS=$LIBCRYPTO_LIBS; LIBCRYPTO_INCLUDES=$LIBCRYPTO_INCLUDES" >&AS_MESSAGE_LOG_FD
save_LIBS="$LIBS"
save_LDFLAGS="$LDFLAGS"
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
save_LDFLAGS="$LDFLAGS"
save_CPPFLAGS="$CPPFLAGS"
- LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
- LIBS="$OPENSSL_LIBS $LIBS"
- CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
+ LDFLAGS="$LDFLAGS $LIBCRYPTO_LDFLAGS"
+ LIBS="$LIBCRYPTO_LIBS $LIBS"
+ CPPFLAGS="$LIBCRYPTO_INCLUDES $CPPFLAGS"
- [AC_LANG_PROGRAM([#include <openssl/crypto.h>], [CRYPTO_free(NULL)])],
+ [AC_LANG_PROGRAM([#include <openssl/crypto.h>], [ERR_load_CRYPTO_strings()])],
- openssl_ecdsa=yes
- AC_CHECK_FUNC(ECDSA_do_sign,
- [
- AC_CHECK_DECLS([NID_X9_62_prime256v1, NID_secp384r1], [ : ], [ openssl_ecdsa=no ], [AC_INCLUDES_DEFAULT
-#include <openssl/evp.h>
- ])
- ], [
- openssl_ecdsa=no
- ])
- AS_IF([test "x$openssl_ecdsa" = "xyes"], [
- AC_DEFINE([HAVE_OPENSSL_ECDSA], [1], [define to 1 if OpenSSL ecdsa support is avalable.])
- ])
$1
], [
AC_MSG_RESULT([no])
$1
], [
AC_MSG_RESULT([no])
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
- AC_SUBST([OPENSSL_INCLUDES])
- AC_SUBST([OPENSSL_LIBS])
- AC_SUBST([OPENSSL_LDFLAGS])
+ AC_SUBST([LIBCRYPTO_INCLUDES])
+ AC_SUBST([LIBCRYPTO_LIBS])
+ AC_SUBST([LIBCRYPTO_LDFLAGS])
--- /dev/null
+AC_DEFUN([PDNS_CHECK_LIBCRYPTO_ECDSA], [
+ AC_REQUIRE([PDNS_CHECK_LIBCRYPTO])
+ libcrypto_ecdsa=yes
+ AC_CHECK_HEADER([openssl/ecdsa.h], [
+ AC_CHECK_DECLS([NID_X9_62_prime256v1, NID_secp384r1], [ : ], [
+ libcrypto_ecdsa=no
+ ], [AC_INCLUDES_DEFAULT
+#include <openssl/evp.h>
+ ])
+ ], [
+ libcrypto_ecdsa=no
+ ])
+
+ AS_IF([test "x$libcrypto_ecdsa" = "xyes"], [
+ AC_DEFINE([HAVE_LIBCRYPTO_ECDSA], [1], [define to 1 if OpenSSL ecdsa support is avalable.])
+ ])
+])
AM_CPPFLAGS += \
-I$(top_srcdir)/ext/json11 \
$(YAHTTP_CFLAGS) \
AM_CPPFLAGS += \
-I$(top_srcdir)/ext/json11 \
$(YAHTTP_CFLAGS) \
$(LIBZMQ_CFLAGS)
AM_LDFLAGS = $(THREADFLAGS)
$(LIBZMQ_CFLAGS)
AM_LDFLAGS = $(THREADFLAGS)
libtestremotebackend_la_LIBADD = \
$(YAHTTP_LIBS) \
libtestremotebackend_la_LIBADD = \
$(YAHTTP_LIBS) \
$(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
$(BOOST_PROGRAM_OPTIONS_LIBS) \
$(LIBDL) $(JSON11_LIBS)
$(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
$(BOOST_PROGRAM_OPTIONS_LIBS) \
$(LIBDL) $(JSON11_LIBS)
-I$(top_srcdir)/ext/json11 \
$(YAHTTP_CFLAGS) \
$(LIBEDIT_CFLAGS) \
-I$(top_srcdir)/ext/json11 \
$(YAHTTP_CFLAGS) \
$(LIBEDIT_CFLAGS) \
+ $(LIBCRYPTO_INCLUDES) \
$(SYSTEMD_CFLAGS)
AM_CXXFLAGS = \
$(SYSTEMD_CFLAGS)
AM_CXXFLAGS = \
pdns_server_LDFLAGS = \
$(AM_LDFLAGS) \
$(DYNLINKFLAGS) \
pdns_server_LDFLAGS = \
$(AM_LDFLAGS) \
$(DYNLINKFLAGS) \
pdns_server_LDADD = \
@moduleobjects@ \
pdns_server_LDADD = \
@moduleobjects@ \
$(LIBDL) \
$(YAHTTP_LIBS) \
$(JSON11_LIBS) \
$(LIBDL) \
$(YAHTTP_LIBS) \
$(JSON11_LIBS) \
$(SYSTEMD_LIBS)
if BOTAN110
$(SYSTEMD_LIBS)
if BOTAN110
$(AM_LDFLAGS) \
$(DYNLINKFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
$(AM_LDFLAGS) \
$(DYNLINKFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
pdnsutil_LDADD = \
@moduleobjects@ \
pdnsutil_LDADD = \
@moduleobjects@ \
$(JSON11_LIBS) \
$(LIBDL) \
$(BOOST_PROGRAM_OPTIONS_LIBS) \
$(JSON11_LIBS) \
$(LIBDL) \
$(BOOST_PROGRAM_OPTIONS_LIBS) \
if BOTAN110
pdnsutil_SOURCES += botan110signers.cc
if BOTAN110
pdnsutil_SOURCES += botan110signers.cc
zone2sql.cc \
zoneparser-tng.cc
zone2sql.cc \
zoneparser-tng.cc
-zone2sql_LDADD = $(OPENSSL_LIBS) $(JSON11_LIBS)
-zone2sql_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+zone2sql_LDADD = $(LIBCRYPTO_LIBS) $(JSON11_LIBS)
+zone2sql_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
zone2json_SOURCES = \
arguments.cc \
zone2json_SOURCES = \
arguments.cc \
zone2json.cc \
zoneparser-tng.cc
zone2json.cc \
zoneparser-tng.cc
-zone2json_LDADD = $(OPENSSL_LIBS) $(JSON11_LIBS)
-zone2json_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+zone2json_LDADD = $(LIBCRYPTO_LIBS) $(JSON11_LIBS)
+zone2json_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
# pkglib_LTLIBRARIES = iputils.la
# iputils_la_SOURCES = lua-iputils.cc
# pkglib_LTLIBRARIES = iputils.la
# iputils_la_SOURCES = lua-iputils.cc
zone2ldap.cc \
zoneparser-tng.cc
zone2ldap.cc \
zoneparser-tng.cc
-zone2ldap_LDADD = $(OPENSSL_LIBS)
-zone2ldap_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+zone2ldap_LDADD = $(LIBCRYPTO_LIBS)
+zone2ldap_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
sdig_SOURCES = \
base32.cc \
sdig_SOURCES = \
base32.cc \
statbag.cc \
unix_utility.cc
statbag.cc \
unix_utility.cc
-sdig_LDADD = $(OPENSSL_LIBS)
-sdig_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+sdig_LDADD = $(LIBCRYPTO_LIBS)
+sdig_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
calidns_SOURCES = \
base32.cc \
calidns_SOURCES = \
base32.cc \
statbag.cc \
unix_utility.cc
statbag.cc \
unix_utility.cc
-calidns_LDADD = $(OPENSSL_LIBS)
-calidns_LDFLAGS = $(AM_LDFLAGS) $(THREADFLAGS) $(OPENSSL_LDFLAGS)
+calidns_LDADD = $(LIBCRYPTO_LIBS)
+calidns_LDFLAGS = $(AM_LDFLAGS) $(THREADFLAGS) $(LIBCRYPTO_LDFLAGS)
dumresp_SOURCES = \
dnslabeltext.cc \
dumresp_SOURCES = \
dnslabeltext.cc \
stubquery.cc \
unix_utility.cc
stubquery.cc \
unix_utility.cc
-stubquery_LDADD = $(OPENSSL_LIBS)
-stubquery_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+stubquery_LDADD = $(LIBCRYPTO_LIBS)
+stubquery_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
saxfr_SOURCES = \
base32.cc \
saxfr_SOURCES = \
base32.cc \
statbag.cc \
unix_utility.cc
statbag.cc \
unix_utility.cc
-saxfr_LDADD = $(OPENSSL_LIBS)
-saxfr_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+saxfr_LDADD = $(LIBCRYPTO_LIBS)
+saxfr_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
if PKCS11
saxfr_SOURCES += pkcs11signers.cc pkcs11signers.hh
if PKCS11
saxfr_SOURCES += pkcs11signers.cc pkcs11signers.hh
statbag.cc \
unix_utility.cc zoneparser-tng.cc
statbag.cc \
unix_utility.cc zoneparser-tng.cc
-ixplore_LDADD = $(OPENSSL_LIBS)
-ixplore_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+ixplore_LDADD = $(LIBCRYPTO_LIBS)
+ixplore_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
if PKCS11
ixplore_SOURCES += pkcs11signers.cc pkcs11signers.hh
if PKCS11
ixplore_SOURCES += pkcs11signers.cc pkcs11signers.hh
dnstcpbench_LDFLAGS = \
$(AM_LDFLAGS) \
dnstcpbench_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnstcpbench_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnstcpbench_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
nsec3dig_SOURCES = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
nsec3dig_SOURCES = \
statbag.cc \
unix_utility.cc
statbag.cc \
unix_utility.cc
-nsec3dig_LDADD = $(OPENSSL_LIBS)
-nsec3dig_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+nsec3dig_LDADD = $(LIBCRYPTO_LIBS)
+nsec3dig_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
if PKCS11
nsec3dig_SOURCES += pkcs11signers.cc pkcs11signers.hh
if PKCS11
nsec3dig_SOURCES += pkcs11signers.cc pkcs11signers.hh
toysdig_LDFLAGS = $(AM_LDFLAGS) \
toysdig_LDFLAGS = $(AM_LDFLAGS) \
- $(OPENSSL_LDFLAGS)
-toysdig_LDADD = $(OPENSSL_LIBS)
+ $(LIBCRYPTO_LDFLAGS)
+toysdig_LDADD = $(LIBCRYPTO_LIBS)
if GSS_TSIG
toysdig_LDADD += $(GSS_LIBS)
if GSS_TSIG
toysdig_LDADD += $(GSS_LIBS)
tsig-tests.cc \
unix_utility.cc
tsig-tests.cc \
unix_utility.cc
-tsig_tests_LDADD = $(OPENSSL_LIBS)
-tsig_tests_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+tsig_tests_LDADD = $(LIBCRYPTO_LIBS)
+tsig_tests_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
if PKCS11
tsig_tests_SOURCES += pkcs11signers.cc pkcs11signers.hh
if PKCS11
tsig_tests_SOURCES += pkcs11signers.cc pkcs11signers.hh
statbag.cc \
unix_utility.cc
statbag.cc \
unix_utility.cc
-speedtest_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
-speedtest_LDADD = $(OPENSSL_LIBS) \
+speedtest_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
+speedtest_LDADD = $(LIBCRYPTO_LIBS) \
$(RT_LIBS)
dnswasher_SOURCES = \
$(RT_LIBS)
dnswasher_SOURCES = \
dnsbulktest_LDFLAGS = \
$(AM_LDFLAGS) \
dnsbulktest_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnsbulktest_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnsbulktest_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
comfun_SOURCES = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
comfun_SOURCES = \
comfun_LDFLAGS = \
$(AM_LDFLAGS) \
comfun_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
comfun_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
comfun_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
$(BOOST_PROGRAM_OPTIONS_LIBS)
dnsscan_LDFLAGS = \
$(AM_LDFLAGS) \
dnsscan_LDFLAGS = \
$(AM_LDFLAGS) \
-dnsscan_LDADD = $(OPENSSL_LIBS)
+dnsscan_LDADD = $(LIBCRYPTO_LIBS)
dnsreplay_SOURCES = \
anadns.hh \
dnsreplay_SOURCES = \
anadns.hh \
dnsreplay_LDFLAGS = \
$(AM_LDFLAGS) \
dnsreplay_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnsreplay_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnsreplay_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
nproxy_SOURCES = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
nproxy_SOURCES = \
nproxy_LDFLAGS = \
$(AM_LDFLAGS) \
nproxy_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
nproxy_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
nproxy_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
pdns_notify_SOURCES = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
pdns_notify_SOURCES = \
pdns_notify_LDFLAGS = \
$(AM_LDFLAGS) \
pdns_notify_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
pdns_notify_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
pdns_notify_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
dnsscope_SOURCES = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
dnsscope_SOURCES = \
dnsscope_LDFLAGS = \
$(AM_LDFLAGS) \
dnsscope_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnsscope_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnsscope_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
dnsgram_SOURCES = \
$(BOOST_PROGRAM_OPTIONS_LIBS)
dnsgram_SOURCES = \
dnsgram_LDFLAGS = \
$(AM_LDFLAGS) \
dnsgram_LDFLAGS = \
$(AM_LDFLAGS) \
dnsdemog_SOURCES = \
base32.cc \
dnsdemog_SOURCES = \
base32.cc \
dnsdemog_LDFLAGS = \
$(AM_LDFLAGS) \
dnsdemog_LDFLAGS = \
$(AM_LDFLAGS) \
if HAVE_PROTOBUF
if HAVE_PROTOC
if HAVE_PROTOBUF
if HAVE_PROTOC
dnspcap2protobuf_LDFLAGS = \
$(AM_LDFLAGS) \
dnspcap2protobuf_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnspcap2protobuf_LDADD = \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
dnspcap2protobuf_LDADD = \
$(PROTOBUF_LIBS) \
$(BOOST_PROGRAM_OPTIONS_LIBS)
endif
$(PROTOBUF_LIBS) \
$(BOOST_PROGRAM_OPTIONS_LIBS)
endif
testrunner_LDFLAGS = \
$(AM_LDFLAGS) \
testrunner_LDFLAGS = \
$(AM_LDFLAGS) \
$(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
testrunner_LDADD = \
$(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
testrunner_LDADD = \
$(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
$(RT_LIBS) \
$(LIBDL)
$(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
$(RT_LIBS) \
$(LIBDL)
#include "config.h"
#endif
#include <openssl/obj_mac.h>
#include "config.h"
#endif
#include <openssl/obj_mac.h>
-#ifdef HAVE_OPENSSL_ECDSA
+#ifdef HAVE_LIBCRYPTO_ECDSA
#include <openssl/ecdsa.h>
#endif
#include <openssl/sha.h>
#include <openssl/ecdsa.h>
#endif
#include <openssl/sha.h>
-#ifdef HAVE_OPENSSL_ECDSA
+#ifdef HAVE_LIBCRYPTO_ECDSA
class OpenSSLECDSADNSCryptoKeyEngine : public DNSCryptoKeyEngine
{
public:
class OpenSSLECDSADNSCryptoKeyEngine : public DNSCryptoKeyEngine
{
public:
DNSCryptoKeyEngine::report(7, &OpenSSLRSADNSCryptoKeyEngine::maker);
DNSCryptoKeyEngine::report(8, &OpenSSLRSADNSCryptoKeyEngine::maker);
DNSCryptoKeyEngine::report(10, &OpenSSLRSADNSCryptoKeyEngine::maker);
DNSCryptoKeyEngine::report(7, &OpenSSLRSADNSCryptoKeyEngine::maker);
DNSCryptoKeyEngine::report(8, &OpenSSLRSADNSCryptoKeyEngine::maker);
DNSCryptoKeyEngine::report(10, &OpenSSLRSADNSCryptoKeyEngine::maker);
-#ifdef HAVE_OPENSSL_ECDSA
+#ifdef HAVE_LIBCRYPTO_ECDSA
DNSCryptoKeyEngine::report(13, &OpenSSLECDSADNSCryptoKeyEngine::maker);
DNSCryptoKeyEngine::report(14, &OpenSSLECDSADNSCryptoKeyEngine::maker);
#endif
DNSCryptoKeyEngine::report(13, &OpenSSLECDSADNSCryptoKeyEngine::maker);
DNSCryptoKeyEngine::report(14, &OpenSSLECDSADNSCryptoKeyEngine::maker);
#endif
-I$(top_srcdir)/ext/json11 \
-I$(top_srcdir)/ext/rapidjson/include \
$(YAHTTP_CFLAGS) \
-I$(top_srcdir)/ext/json11 \
-I$(top_srcdir)/ext/rapidjson/include \
$(YAHTTP_CFLAGS) \
AM_CXXFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \
AM_CXXFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \
pdns_recursor_LDADD = \
$(YAHTTP_LIBS) \
$(JSON11_LIBS) \
pdns_recursor_LDADD = \
$(YAHTTP_LIBS) \
$(JSON11_LIBS) \
$(BOOST_CONTEXT_LIBS) \
$(SYSTEMD_LIBS) \
$(RT_LIBS)
pdns_recursor_LDFLAGS = $(AM_LDFLAGS) \
$(BOOST_CONTEXT_LIBS) \
$(SYSTEMD_LIBS) \
$(RT_LIBS)
pdns_recursor_LDFLAGS = $(AM_LDFLAGS) \
if BOTAN110
pdns_recursor_SOURCES += \
if BOTAN110
pdns_recursor_SOURCES += \
# Crypto libraries
PDNS_ENABLE_BOTAN
# Crypto libraries
PDNS_ENABLE_BOTAN
- AC_MSG_ERROR([OpenSSL not found])
-])
+ AC_MSG_ERROR([OpenSSL/libcrypto not found])
+ ]
+)
+PDNS_CHECK_LIBCRYPTO_ECDSA
# check for tools we might need
PDNS_CHECK_RAGEL
# check for tools we might need
PDNS_CHECK_RAGEL
[AC_MSG_NOTICE([LuaJit: $LUAJITPC])],
[AC_MSG_NOTICE([Lua/LuaJit: no])])
])
[AC_MSG_NOTICE([LuaJit: $LUAJITPC])],
[AC_MSG_NOTICE([Lua/LuaJit: no])])
])
+AC_MSG_NOTICE([OpenSSL ECDSA: $libcrypto_ecdsa])
AS_IF([test "x$PROTOBUF_LIBS" != "x" -a x"$PROTOC" != "x"],
[AC_MSG_NOTICE([Protobuf: yes])],
[AC_MSG_NOTICE([Protobuf: no])]
AS_IF([test "x$PROTOBUF_LIBS" != "x" -a x"$PROTOC" != "x"],
[AC_MSG_NOTICE([Protobuf: yes])],
[AC_MSG_NOTICE([Protobuf: no])]
+++ /dev/null
-../../../m4/ax_check_openssl.m4
\ No newline at end of file
--- /dev/null
+../../../m4/pdns_check_libcrypto.m4
\ No newline at end of file
--- /dev/null
+../../../m4/pdns_check_libcrypto_ecdsa.m4
\ No newline at end of file