From 6a699049afe5c7b1cf30f3fc53a09fc35f2ebf3a Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Thu, 24 Dec 2015 22:20:13 +0100 Subject: [PATCH] remove mbed leftovers from dnsdist --- pdns/dnsdistdist/Makefile.am | 9 ++------- pdns/dnsdistdist/configure.ac | 1 - pdns/dnsdistdist/ext/mbedtls/include/mbedtls/base64.h | 1 - .../ext/mbedtls/include/mbedtls/check_config.h | 1 - pdns/dnsdistdist/ext/mbedtls/include/mbedtls/config.h | 1 - pdns/dnsdistdist/ext/mbedtls/include/mbedtls/platform.h | 1 - pdns/dnsdistdist/ext/mbedtls/library/base64.c | 1 - 7 files changed, 2 insertions(+), 13 deletions(-) delete mode 120000 pdns/dnsdistdist/ext/mbedtls/include/mbedtls/base64.h delete mode 120000 pdns/dnsdistdist/ext/mbedtls/include/mbedtls/check_config.h delete mode 120000 pdns/dnsdistdist/ext/mbedtls/include/mbedtls/config.h delete mode 120000 pdns/dnsdistdist/ext/mbedtls/include/mbedtls/platform.h delete mode 120000 pdns/dnsdistdist/ext/mbedtls/library/base64.c diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index 2e451670d2..6b99e5d239 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(SANITIZER_FLAGS) -I$(CURDIR)/ext/mbedtls/include -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" +AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" ACLOCAL_AMFLAGS = -I m4 @@ -63,12 +63,7 @@ dnsdist_SOURCES = \ ext/luawrapper/include/LuaContext.hpp \ ext/json11/json11.cpp \ ext/json11/json11.hpp \ - ext/incbin/incbin.h \ - ext/mbedtls/include/mbedtls/config.h \ - ext/mbedtls/include/mbedtls/check_config.h \ - ext/mbedtls/include/mbedtls/base64.h \ - ext/mbedtls/include/mbedtls/platform.h \ - ext/mbedtls/library/base64.c + ext/incbin/incbin.h dnsdist_LDFLAGS = \ $(AM_LDFLAGS) \ diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac index 4b9b52ef43..5c374224e4 100644 --- a/pdns/dnsdistdist/configure.ac +++ b/pdns/dnsdistdist/configure.ac @@ -26,7 +26,6 @@ AS_IF([test "x$LUAPC" = "x" -a "x$LUAJITPC" = "x"], [ ]) AX_CXX_COMPILE_STDCXX_11(ext,mandatory) -AC_DEFINE([HAVE_MBEDTLS2], [1], [Defined if mbed TLS version 2.x.x is used]) AC_MSG_CHECKING([whether we will enable compiler security checks]) AC_ARG_ENABLE([hardening], diff --git a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/base64.h b/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/base64.h deleted file mode 120000 index 5819ad3b39..0000000000 --- a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/base64.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../ext/mbedtls/include/mbedtls/base64.h \ No newline at end of file diff --git a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/check_config.h b/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/check_config.h deleted file mode 120000 index e4d884220b..0000000000 --- a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/check_config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../ext/mbedtls/include/mbedtls/check_config.h \ No newline at end of file diff --git a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/config.h b/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/config.h deleted file mode 120000 index 6e46afb9c8..0000000000 --- a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../ext/mbedtls/include/mbedtls/config.h \ No newline at end of file diff --git a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/platform.h b/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/platform.h deleted file mode 120000 index 867008718b..0000000000 --- a/pdns/dnsdistdist/ext/mbedtls/include/mbedtls/platform.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../ext/mbedtls/include/mbedtls/platform.h \ No newline at end of file diff --git a/pdns/dnsdistdist/ext/mbedtls/library/base64.c b/pdns/dnsdistdist/ext/mbedtls/library/base64.c deleted file mode 120000 index 5f26dddbe2..0000000000 --- a/pdns/dnsdistdist/ext/mbedtls/library/base64.c +++ /dev/null @@ -1 +0,0 @@ -../../../../../ext/mbedtls/library/base64.c \ No newline at end of file -- 2.47.2