[3476] JSON is now the default configuration backend

diff --git a/ChangeLog b/ChangeLog
index 853c25487370c21b7edeacd58ae79b358b3289a9..26d4d3814d5a5cde72c72ec3df7cdcb8af10becb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+7XX.   [build]         tomek
+       JSON configuration backend is now the default. BUNDY backend
+       is now deprecated after #3413 removed the BIND10/Bundy framework.
+       (Trac #3476, git abcd)
+
 797.   [build]         tomek
        Removed a lot of remaining BIND10 framework: bind10, bindctl,
        cfgmgr, cmdctl, msgq, stats, sysinfo, tests, usermgr from src/bin

diff --git a/configure.ac b/configure.ac
index d2ce615d8cc3e379d07dce5b33bbc8c9fc931704..ae640644792f9846ef0887d52c04e3db873b8159 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1238,11 +1238,11 @@ AC_SUBST(AWK)
 # It is possible that we may extend this to accept additional backends.
 AC_ARG_WITH(kea-config,
     AC_HELP_STRING([--with-kea-config],
-    [Selects configuration backend; currently available options are: BUNDY (default,
-    Kea reads configuration and commands from Bundy framework) or JSON (Kea reads
-    configuration from a JSON file from disk)]),
+    [Selects configuration backend; currently available options are: BUNDY
+    (Kea reads configuration and commands from Bundy framework) or JSON (default,
+    Kea reads configuration from a JSON file from disk)]),
     [CONFIG_BACKEND="$withval"],
-    [CONFIG_BACKEND=BUNDY])
+    [CONFIG_BACKEND=JSON])
 
 AM_CONDITIONAL(CONFIG_BACKEND_BUNDY, test "x$CONFIG_BACKEND" = "xBUNDY")
 AM_CONDITIONAL(CONFIG_BACKEND_JSON,   test "x$CONFIG_BACKEND" = "xJSON")