remove mbed leftovers from dnsdist

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 2e451670d24c442a026fe52659fc1f866dbda69e..6b99e5d2398c5a157cf9b2d1200edb21d9c122c7 100644 (file)
--- 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 4b9b52ef4326d831f36f1bac85c3c22d7b750787..5c374224e4238669b03a39c0a18e32acd18d335c 100644 (file)
--- 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 (symlink)
index 5819ad3..0000000
--- 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 (symlink)
index e4d8842..0000000
--- 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 (symlink)
index 6e46afb..0000000
--- 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 (symlink)
index 8670087..0000000
--- 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 (symlink)
index 5f26ddd..0000000
--- a/pdns/dnsdistdist/ext/mbedtls/library/base64.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../ext/mbedtls/library/base64.c
\ No newline at end of file