- Fix for #4233: guard use of NDEBUG, so that it can be passed in

  CFLAGS into configure.

git-svn-id: file:///svn/unbound/trunk@5133 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/config.h.in b/config.h.in
index f0eb7d6aa9f87147a135245439e78545221433df..7c3309683daae00e568b091ece86272d08f09cfc 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -966,7 +966,9 @@
 
 
 #ifndef UNBOUND_DEBUG
+# ifndef NDEBUG
 #  define NDEBUG
+# endif
 #endif
 
 /** Use small-ldns codebase */

diff --git a/configure.ac b/configure.ac
index ff6f05ad75a16a54598567da27197fe0271857c9..8393e152aff3eda7419fa975b2e65783e054fc33 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1652,7 +1652,9 @@ AHX_CONFIG_EXT_FLAGS
 dnl includes
 [
 #ifndef UNBOUND_DEBUG
+# ifndef NDEBUG
 #  define NDEBUG
+# endif
 #endif
 
 /** Use small-ldns codebase */

diff --git a/doc/Changelog b/doc/Changelog
index 4bb3416534069bb7ead3ad2968d53cd163677d58..43db794663864deca9168dbcf339d8568a3d5509 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+7 March 2019: Wouter
+       - Fix for #4233: guard use of NDEBUG, so that it can be passed in
+         CFLAGS into configure.
+
 5 March 2019: Wouter
        - Tag release 1.9.1rc1.