Move DEBUG-enablement checks to ntp_libntp.m4

bk: 4d367f7cs5p-lshAb4KJQO7EKpL45w

diff --git a/configure.ac b/configure.ac
index e3015c83ef8eac3212d281e414ab47e9ed816f6e..5c32f9a77e242a2037ddd5b5bce8f993adc3d837 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1971,22 +1971,6 @@ case "$ntp_cv_no_parenb_ignpar" in
        [Is there a problem using PARENB and IGNPAR?])
 esac
 
-AC_MSG_CHECKING([if we're including ntpd debugging code])
-AC_ARG_ENABLE(
-    [debugging],
-    [AS_HELP_STRING(
-        [--enable-debugging],
-        [+ include ntpd debugging code]
-    )],
-    [ntp_ok=$enableval],
-    [ntp_ok=yes]
-)
-case "$ntp_ok" in
- yes)
-    AC_DEFINE([DEBUG], [1], [Enable ntpd debugging code?])
-esac
-AC_MSG_RESULT([$ntp_ok])
-
 AC_MSG_CHECKING([if we're including processing time debugging code])
 AC_ARG_ENABLE(
     [debug-timing],

diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index 04474759782fd938075b0aada7cd6b8dee83027f..14ebe382bde3ace68f4828168007861913e7b006 100644 (file)
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -1,7 +1,23 @@
 dnl ######################################################################
-dnl Common m4sh code for libntp clients
+dnl Common m4sh code for debug and libntp clients
 AC_DEFUN([NTP_LIBNTP], [
 
+AC_MSG_CHECKING([if we're including debugging code])
+AC_ARG_ENABLE(
+    [debugging],
+    [AS_HELP_STRING(
+        [--enable-debugging],
+        [+ include ntpd debugging code]
+    )],
+    [ntp_ok=$enableval],
+    [ntp_ok=yes]
+)
+case "$ntp_ok" in
+ yes)
+    AC_DEFINE([DEBUG], [1], [Enable debugging code?])
+esac
+AC_MSG_RESULT([$ntp_ok])
+
 # Expose a cross-compilation indicator to makefiles
 AM_CONDITIONAL([NTP_CROSSCOMPILE], [test $build != $host])