Commit 8e9db17f authored by Daniel Salzman's avatar Daniel Salzman

configure: remove HASH_TABLE and LDNS config and code

parent 940d1ff3
......@@ -47,26 +47,24 @@ AM_PROG_LEX
AC_PROG_YACC
YACC_BISON=`bison --version | awk '{print $1;exit}'`
AS_IF([test "x$YACC_BISON" != "xbison"],
AS_IF([test "x$YACC_BISON" != "xbison"],
[AC_MSG_ERROR([GNU bison needed for reentrant parsers, set the \$YACC variable before running configure])])
AC_PROG_INSTALL
# Check for Ragel
AC_PATH_PROG([RAGEL], [ragel], [echo !UNPROCESSED! ragel])
# Set FSM type for Ragel
AC_SUBST([FSM_TYPE], [-T0])
AC_ARG_ENABLE([fastparser],
AS_HELP_STRING([--enable-fastparser], [Set to generate fast goto driven state machine (Ragel option G2)]),
AC_SUBST([FSM_TYPE], [-G2]),
[])
# Set compiler compatibility flags
AC_PROG_CPP_WERROR
AC_PROG_CC_C99
AC_ARG_ENABLE([ldns],
AS_HELP_STRING([--enable-ldns=yes|no], [Enable tests with ldns [default=no]]),
[case "${enableval}" in
yes) AC_SEARCH_LIBS([ldns_rr_list_pop_rrset], [ldns], [AC_DEFINE([HAVE_LDNS], [1], [ldns present])],
AC_MSG_ERROR([ldns not found])) ;;
no) ldns=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-ldns]) ;;
esac],[ldns=false])
# Debug modules
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug=server,zones,xfr,packet,dname,rr,ns,hash,compiler,stash],
......@@ -88,13 +86,6 @@ AC_ARG_ENABLE([debug],
done
], [])
# Set FSM type for Ragel
AC_SUBST([FSM_TYPE], [-T0])
AC_ARG_ENABLE([fastparser],
AS_HELP_STRING([--enable-fastparser], [Set to generate fast goto driven state machine (Ragel option G2)]),
AC_SUBST([FSM_TYPE], [-G2]),
[])
# Debug level
AC_ARG_ENABLE([debuglevel],
AS_HELP_STRING([--enable-debuglevel=brief|verbose|details], [enable given debug level [default=disabled]]),
......@@ -130,7 +121,7 @@ AC_ARG_ENABLE([recvmmsg],
no)
recvmmsg=false
;;
*)
*)
AC_MSG_ERROR([bad value ${enableval} for --enable-recvmmsg])
;;
esac], [
......@@ -171,7 +162,6 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
AC_SEARCH_LIBS([OpenSSL_add_all_digests], [crypto],[], [AC_MSG_ERROR([libcrypto not found])])
AC_SEARCH_LIBS([capng_apply], [cap-ng])
AC_SEARCH_LIBS([adler32], [z])
#AC_SEARCH_LIBS([ldns_rr_list_pop_rrset], [ldns], [], [AC_MSG_ERROR([libldns not found])])
# Checks for header files.
AC_HEADER_RESOLV
......
......@@ -28,10 +28,6 @@
#include "common/errcode.h"
#include "common/mempattern.h"
#ifdef HAVE_LIBLDNS
#define TEST_WITH_LDNS
#endif
#ifndef _KNOT_COMMON_H_
#define _KNOT_COMMON_H_
......@@ -43,9 +39,6 @@ typedef unsigned int uint; /*!< \brief Unsigned. */
#define UINT_DEFINED
#endif
/*! \brief If defined, zone structures will use hash table for lookup. */
#define USE_HASH_TABLE
/*! \brief Eliminate compiler warning with unused parameters. */
#define UNUSED(param) (void)(param)
......
......@@ -27,8 +27,6 @@
#ifndef _KNOT_ZONE_CONTENTS_H_
#define _KNOT_ZONE_CONTENTS_H_
//#include <time.h>
#include "zone/node.h"
#include "dname.h"
#include "nsec3.h"
......@@ -253,28 +251,6 @@ const knot_node_t *knot_zone_contents_find_previous_nsec3(
knot_node_t *knot_zone_contents_get_previous_nsec3(
const knot_zone_contents_t *contents, const knot_dname_t *name);
#ifdef USE_HASH_TABLE
/*!
* \brief Tries to find domain name in the given zone using the hash table.
*
* \param[in] zone Zone to search for the name.
* \param[in] name Domain name to search for.
* \param[out] node The found node (if it was found, otherwise it may contain
* arbitrary node).
* \param[out] closest_encloser Closest encloser of the given name in the zone.
* \param[out] previous Previous domain name in canonical order.
*
* \retval KNOT_ZONE_NAME_FOUND if node with owner \a name was found.
* \retval KNOT_ZONE_NAME_NOT_FOUND if it was not found.
* \retval KNOT_EINVAL
* \retval KNOT_EBADZONE
*/
int knot_zone_contents_find_dname_hash(const knot_zone_contents_t *contents,
const knot_dname_t *name,
const knot_node_t **node,
const knot_node_t **closest_encloser);
#endif
/*!
* \brief Tries to find a node with the specified name among the NSEC3 nodes
* of the zone.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment