From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 27 May 2019 18:59:03 +0000 (-0400)
Subject: [master] Revert "[#584,!338] Only install YANG and netconf files with --with-sysrepo"
X-Git-Tag: Kea-1.6.0-beta~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa96b8d337ef376653e1fd2fc00074f10a4ac827;p=thirdparty%2Fkea.git

[master] Revert "[#584,!338] Only install YANG and netconf files with --with-sysrepo"

    This reverts commit b25b30323b554fb87a9095a03d936b218ba79098.
---

diff --git a/ChangeLog b/ChangeLog
index ada9b17c67..1f9cb57aad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,11 @@
-1587.	[build]		razvan, marcin
+1586.	[build]		razvan, marcin
 	Bumped up libraries version numbers for Kea 1.6.0 beta release.
 	(Gitlab #617,!340, git c0434bf882b6ec483120e39f6b70b5a40fe7c711)
 
-1586.	[bug, func]		marcin
+1585.	[bug, func]		marcin
 	MySQL Configuration Backend supports DHCPv6 interface-id parameter.
 	(Gitlab #628,!341, git 3a07c636ba4c7fceabe59ec597c44a9c8e3367eb)
 
-1585.	[build]		tmark
-	Files related to YANG and netconf are now only installed
-	when the build is configured with --with-syspro.
-	(Gitlab #584,!338, git 882022ce95006b051d0d17f8e5fdf4f3571b8ae2)
-
 1584.	[doc]		marcin
 	Documented Kea Configuration Backend in the Kea Administrator
 	Reference Manual.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 32f33a690a..c8d604fbcb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -68,7 +68,9 @@ nobase_dist_doc_DATA += examples/kea6/softwire46.json
 nobase_dist_doc_DATA += examples/kea6/stateless.json
 nobase_dist_doc_DATA += examples/kea6/with-ddns.json
 
-if HAVE_SYSREPO
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-config.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-schema.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-translator.xml
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/boot.json
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/logging.xml
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/netconf.json
@@ -78,7 +80,6 @@ nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/twosubnets.xml
 nobase_dist_doc_DATA += examples/netconf/comments.json
 nobase_dist_doc_DATA += examples/netconf/simple-dhcp4.json
 nobase_dist_doc_DATA += examples/netconf/simple-dhcp6.json
-endif
 
 # These are files that document our APIs. They're not really needed as the
 # content is included in the api.xml, but may be useful for people who
diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index af32b3d81b..9bfb89d71c 100644
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -6,12 +6,7 @@ SUBDIRS = . tests
 # setting KEACTRL_CONF environment variable.
 sbin_SCRIPTS  = keactrl
 KEA_CONFIGFILES = kea-dhcp4.conf kea-dhcp6.conf kea-dhcp-ddns.conf \
-                  kea-ctrl-agent.conf
-
-if HAVE_SYSREPO
-KEA_CONFIGFILES += kea-netconf.conf
-endif
-
+                  kea-ctrl-agent.conf kea-netconf.conf
 CONFIGFILES = keactrl.conf $(KEA_CONFIGFILES)
 
 man_MANS = keactrl.8
@@ -22,10 +17,6 @@ EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \
              kea-ctrl-agent.conf.pre \
              $(man_MANS) keactrl.xml
 
-if HAVE_SYSREPO
-EXTRA_DIST += kea-netconf.conf.pre
-endif
-
 # *.conf files are not really sources used for building other targets, but we need
 # these files to be generated before make install is called.
 BUILT_SOURCES = $(KEA_CONFIGFILES)
@@ -60,11 +51,9 @@ kea-ctrl-agent.conf: kea-ctrl-agent.conf.pre
 	$(top_builddir)/tools/path_replacer.sh \
     $(top_srcdir)/src/bin/keactrl/kea-ctrl-agent.conf.pre $@
 
-if HAVE_SYSREPO
 kea-netconf.conf: kea-netconf.conf.pre
 	$(top_builddir)/tools/path_replacer.sh \
     $(top_srcdir)/src/bin/keactrl/kea-netconf.conf.pre $@
-endif
 
 if INSTALL_CONFIGURATIONS
 
diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index a4672e9b73..16d6161337 100644
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -1,6 +1 @@
-SUBDIRS = database
-
-if HAVE_SYSREPO
-SUBDIRS += yang
-endif
-
+SUBDIRS = database yang