[Git][NTPsec/ntpsec][master] 2 commits: DEBUG now defaults to on

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
c90caca4 by Hal Murray at 2015-12-05T15:58:03Z
DEBUG now defaults to on

- - - - -
b7c90b50 by Hal Murray at 2015-12-05T15:59:06Z
Merge branch 'master' of gitlab.com:NTPsec/ntpsec

- - - - -


2 changed files:

- pylib/configure.py
- wscript


Changes:

=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -34,7 +34,7 @@ def cmd_configure(ctx):
 	if ctx.options.enable_saveconfig:
 		ctx.define("SAVECONFIG", 1)
 
-	if ctx.options.enable_debug:
+	if not ctx.options.disable_debug:
 		ctx.define("DEBUG", 1)
 		ctx.env.BISONFLAGS += ["--debug"]
 
@@ -485,6 +485,12 @@ def cmd_configure(ctx):
 	msg_setting("CFLAGS", " ".join(ctx.env.CFLAGS))
 	msg_setting("LDFLAGS", " ".join(ctx.env.LDFLAGS))
 	msg_setting("PREFIX", ctx.env.PREFIX)
-	msg_setting("Debug Support", yesno(ctx.options.enable_debug))
+	msg_setting("Debug Support", yesno(not ctx.options.disable_debug))
 	msg_setting("Refclocks", ", ".join(ctx.env.REFCLOCK_LIST))
 	msg_setting("Build Manpages", yesno(ctx.env.BIN_A2X and not ctx.env.DISABLE_MANPAGE))
+
+	if ctx.options.enable_debug:
+		msg("")
+		msg("*** --enable-debug ignored.  (default on now)")
+		msg("")
+


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -39,7 +39,8 @@ def options(ctx):
 		OPT_STORE.setdefault(opt, []).append(value)
 
 	grp = ctx.add_option_group("NTP configure options")
-	grp.add_option('--enable-debug', action='store_true', default=False, help="Enable debugging code")
+	grp.add_option('--enable-debug', action='store_true', default=False, help="(ignored)")
+	grp.add_option('--disable-debug', action='store_true', default=False, help="Disable debugging code")
 	grp.add_option('--enable-debug-gdb', action='store_true', default=False, help="Enable GDB debugging symbols")
 	grp.add_option('--enable-crypto', action='store_true', default=False, help="Enable OpenSSL.")
 	grp.add_option('--disable-droproot', action='store_true', default=False, help="Disable dropping root.")



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/3dd628b561704e89f16e5d202fd001d13cff0d7c...b7c90b50ce30eed5e7000914681cd9536343c1d7
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151205/a96c1e8f/attachment.html>