From: Vincent Bernat <vincent@bernat.im>
Date: Tue, 12 May 2015 08:12:16 +0000 (+0200)
Subject: build: enable JSON/XML support automatically by default
X-Git-Tag: 0.7.15~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd8c9fe3b1682103dcd8b7632fd01872559c7e56;p=thirdparty%2Flldpd.git

build: enable JSON/XML support automatically by default
---

diff --git a/NEWS b/NEWS
index b04b99cb..2840326e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 lldpd (0.7.15)
   * Features:
     + Optional features can be configured with "auto" to autodetect if
-      they are usable.
+      they are usable. This is the default value for JSON and XML support.
 
 lldpd (0.7.14)
   * Features:
diff --git a/configure.ac b/configure.ac
index 95a8eab4..8265d570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,18 +191,18 @@ lldp_CHECK_SNMP
 AC_ARG_WITH([xml],
   AS_HELP_STRING(
     [--with-xml],
-    [Enable XML output via libxml2 @<:@default=no@:>@]),
+    [Enable XML output via libxml2 @<:@default=auto@:>@]),
   [],
-  [with_xml=no])
+  [with_xml=auto])
 lldp_CHECK_XML2
 
 # JSON
 AC_ARG_WITH([json],
   AS_HELP_STRING(
     [--with-json],
-    [Enable JSON output via janson,json-c,no @<:@default=no@:>@]),
+    [Enable JSON output via janson or json-c @<:@default=auto@:>@]),
   [],
-  [with_json=no])
+  [with_json=auto])
 if test x"$with_json" = x"yes" -o x"$with_json" = x"auto"; then
    _with_json="$with_json"
    with_json=auto