From: Miek Gieben Date: Wed, 13 Apr 2005 12:27:04 +0000 (+0000) Subject: ssl autoconf stuff lifted from NSD X-Git-Tag: release-0.50~132 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e226e2b66dc8a45b50302f558b5355b2c3fdbf86;p=thirdparty%2Fldns.git ssl autoconf stuff lifted from NSD --- diff --git a/chaos.c b/chaos.c index 5ddbefc8..3af74d39 100644 --- a/chaos.c +++ b/chaos.c @@ -75,7 +75,11 @@ main(int argc, char *argv[]) info = ldns_pkt_rr_list_by_type(p, LDNS_RR_TYPE_TXT, LDNS_SECTION_ANSWER); - ldns_rr_list_print(stdout, info); + if (info) { + ldns_rr_list_print(stdout, info); + } else { + printf(" *** version retrieval failed\n"); + } } else { printf(" *** query failed for %s\n", ldns_rr2str(ldns_rr_list_rr(addr, i))); @@ -87,7 +91,11 @@ main(int argc, char *argv[]) if (p) { info = ldns_pkt_rr_list_by_type(p, LDNS_RR_TYPE_TXT, LDNS_SECTION_ANSWER); - ldns_rr_list_print(stdout, info); + if (info) { + ldns_rr_list_print(stdout, info); + } else { + printf(" *** id retrieval failed\n"); + } } else { printf(" *** query failed for %s\n", ldns_rr2str(ldns_rr_list_rr(addr, i))); diff --git a/configure.ac b/configure.ac index d17e28e5..31e525d5 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,48 @@ fi AC_PATH_PROG(doxygen, doxygen, "/usr/bin/doxygen") # Checks for libraries. +# Check for SSL, original taken from +# http://www.gnu.org/software/ac-archive/htmldoc/check_ssl.html and +# modified for NSD and +# copied again for use in ldns +AC_DEFUN([CHECK_SSL], + AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname], + [enable SSL (will check /usr/local/ssl + /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr)]),[ + ],[ + withval="yes" + ]) + if test x_$withval != x_no; then + AC_MSG_CHECKING(for SSL) + if test x_$withval = x_ -o x_$withval = x_yes; then + withval="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr" + fi + for dir in $withval; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then + found_ssl="yes"; + AC_DEFINE_UNQUOTED([HAVE_SSL], [], [Define if you have the SSL libraries installed.]) + CPPFLAGS="$CPPFLAGS -I$ssldir/include"; + break; + fi + done + if test x_$found_ssl != x_yes; then + AC_MSG_ERROR(Cannot find the SSL libraries in $withval) + else + AC_MSG_RESULT(found in $ssldir) + HAVE_SSL=yes + LDFLAGS="$LDFLAGS -L$ssldir/lib"; + AC_CHECK_LIB(crypto, HMAC_CTX_init,, [ + AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + ]) + fi + AC_SUBST(HAVE_SSL) + fi +])dnl + + + + # Use libtool AC_PROG_LIBTOOL