From 00b5f4c389587f620fa9f128572b973d8093915d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 11 Feb 2021 14:07:26 +0100 Subject: [PATCH] Remove the extra CFLAGS from libisc_CFLAGS and libdns_CFLAGS The extra library CFLAGS were causing the headers to be included in wrong order possibly pulling header files from previously installed BIND 9 version. This commit cleans up the extra _CFLAGS from the includes in favor of not exposing 3rd party headers in our own header files. --- Makefile.top | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/Makefile.top b/Makefile.top index c784c17518..eb28daf458 100644 --- a/Makefile.top +++ b/Makefile.top @@ -18,11 +18,6 @@ AM_LDFLAGS += \ -Wl,-flat_namespace endif HOST_MACOS -if HAVE_GSSAPI -AM_CPPFLAGS += \ - $(GSSAPI_CFLAGS) -endif - LIBISC_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib/isc/unix/include \ @@ -30,21 +25,6 @@ LIBISC_CFLAGS = \ -I$(top_srcdir)/lib/isc/include \ -I$(top_builddir)/lib/isc/include -if HAVE_JSON_C -LIBISC_CFLAGS += \ - $(JSON_C_CFLAGS) -endif HAVE_JSON_C - -if HAVE_LIBXML2 -LIBISC_CFLAGS += \ - $(LIBXML2_CFLAGS) -endif HAVE_LIBXML2 - -if HAVE_READLINE -LIBISC_CFLAGS += \ - $(READLINE_CFLAGS) -endif HAVE_READLINE - LIBISC_LIBS = $(top_builddir)/lib/isc/libisc.la LIBDNS_CFLAGS = \ @@ -54,16 +34,6 @@ LIBDNS_CFLAGS = \ LIBDNS_LIBS = \ $(top_builddir)/lib/dns/libdns.la -if HAVE_DNSTAP -LIBDNS_CFLAGS += \ - $(DNSTAP_CFLAGS) -endif HAVE_DNSTAP - -if HAVE_LMDB -LIBDNS_CFLAGS += \ - $(LMDB_CFLAGS) -endif HAVE_LMDB - LIBNS_CFLAGS = \ -I$(top_srcdir)/lib/ns/include