From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 19 Jan 2011 06:06:52 +0000 (+0000)
Subject: Move DEBUG-enablement checks to ntp_libntp.m4
X-Git-Tag: NTP_4_2_7P131~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc4633229b4a4d12ead77a920c0c19ba8df6f135;p=thirdparty%2Fntp.git

Move DEBUG-enablement checks to ntp_libntp.m4

bk: 4d367f7cs5p-lshAb4KJQO7EKpL45w
---

diff --git a/configure.ac b/configure.ac
index e3015c83e..5c32f9a77 100644
--- 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 044747597..14ebe382b 100644
--- 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])