[v4_2] Fixed broken handling of --disable-debug

	Merges in rt37780.

3 files changed, 34 insertions, 24 deletions

diff --git a/RELNOTES b/RELNOTES
index 5b18f392..f463e978 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -43,6 +43,13 @@ ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
+			Changes since 4.2.8b1
+
+- Specifying the option, --disable-debug, on the configure script command line
+  now disables debug features.  Prior to this, specifying the --disable-debug
+  incorrectly enabled debug features.
+  [ISC-Bugs #37780]
+
 			Changes since 4.2.7
 
 - Corrected parser's right brace matching when a statement contains an error.
@@ -54,12 +61,12 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #36947]
 
 - Added check for invalid failover message type. Thanks to Tobias Stoeckmann
-  working with the OpendBSD project who spotted the issue and provided the
+  working with the OpenBSD project who spotted the issue and provided the
   patch.
   [ISC-Bugs #36653]
 
 - Corrected rate limiting checks for bad packet logging.  Thanks to Tobias
-  Stoeckmann working with the OpendBSD project who spotted the issue and
+  Stoeckmann working with the OpenBSD project who spotted the issue and
   provided the patch.
   [ISC-Bugs #36897]
 
@@ -99,7 +106,7 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #18010]
   [ISC-Bugs #22556]
   [ISC-Bugs #29769]
-  Inbound packets with UPD checksums of 0xffff now validate correctly rather
+  Inbound packets with UDP checksums of 0xffff now validate correctly rather
   than being dropped.
   [ISC-Bus #24216]
   [ISC-Bus #25587]
@@ -143,7 +150,7 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #20352]
 
 - Corrected an issue which caused dhclient to incorrectly form the result when
-  prepending or appending to the IPv4 domain-search option,received from the
+  prepending or appending to the IPv4 domain-search option, received from the
   server, when either of the values being combined contain compressed
   components.
   [ISC-Bugs #20558]
@@ -1096,8 +1103,8 @@ by Eric Young (eay@cryptsoft.com).
   calculations.  Invalid renew and rebinding times (e.g., greater than the
   determined lease time) are omitted.
 
-- Processing the DHCP to DNS server transactions in an asyncrhonous fashion.
-  The DHCP server or client can now continue with its processing while
+- Processing the DHCP to DNS server transactions in an asyncrhonous fashion,
+  the DHCP server or client can now continue with its processing while
   awaiting replies from the DNS server.
 
 - The 'hardware [ethernet|etc] ...;' parameter in host records has been
diff --git a/configure b/configure
index 97dbc6bc..5a2bbf1b 100755
--- a/configure
+++ b/configure
@@ -5238,19 +5238,21 @@ _ACEOF
 # Optional compile-time DEBUGging.
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; enable_debug=yes
+  enableval=$enable_debug; case "${enableval}" in
+	  yes) enable_debug=yes
+
+$as_echo "#define DEBUG 1" >>confdefs.h
+
+		# Just override CFLAGS totally to remove optimization.
+		CFLAGS="-g";;
+	  no)  enable_debug=no ;;
+	  *)   as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5;;
+	esac
 else
   enable_debug=no
 fi
 
-# This is very much off by default.
-if test "$enable_debug" = "yes" ; then
 
-$as_echo "#define DEBUG 1" >>confdefs.h
-
-	# Just override CFLAGS to totally to remove optimization.
-	CFLAGS="-g"
-fi
 # XXX: there are actually quite a lot more DEBUG_ features we could enable,
 # but I don't want to pollute the --help space.
 #
diff --git a/configure.ac b/configure.ac
index 54a194ed..ebfcdccf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,16 +51,17 @@ AC_DEFINE_UNQUOTED([DHCP_BYTE_ORDER], [$byte_order],
 
 # Optional compile-time DEBUGging.
 AC_ARG_ENABLE(debug,
-	AC_HELP_STRING([--enable-debug],
-		[create a debug-only version of the software (default is no).]),
-		[enable_debug=yes],[enable_debug=no])
-# This is very much off by default.
-if test "$enable_debug" = "yes" ; then
-	AC_DEFINE([DEBUG], [1],
-		[Define to compile debug-only DHCP software.])
-	# Just override CFLAGS to totally to remove optimization.
-	CFLAGS="-g"
-fi
+	AC_HELP_STRING([--enable-debug],[create a debug-only version of the software (default is no).]),
+	[case "${enableval}" in
+	  yes) enable_debug=yes
+		AC_DEFINE([DEBUG], [1],
+			[Define to compile debug-only DHCP software.])
+		# Just override CFLAGS totally to remove optimization.
+		CFLAGS="-g";;
+	  no)  enable_debug=no ;;
+	  *)   AC_MSG_ERROR([bad value ${enableval} for --enable-debug]);;
+	esac],[enable_debug=no])
+
 # XXX: there are actually quite a lot more DEBUG_ features we could enable,
 # but I don't want to pollute the --help space.
 #