From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 1 Jul 2014 11:57:14 +0000 (+0200)
Subject: [3476] JSON is now the default configuration backend
X-Git-Tag: trac3473_base~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88a16ff49808043a823e5b99bcc9332ac3fbefc1;p=thirdparty%2Fkea.git

[3476] JSON is now the default configuration backend
---

diff --git a/ChangeLog b/ChangeLog
index 853c254873..26d4d3814d 100644
--- 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 d2ce615d8c..ae64064479 100644
--- 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")