Merge !202: trust anchor improvements

diff --cc daemon/daemon.mk
index d33b13513b739b725cca2a7ddeed8846f8420469,3b4a678c61f2225f462bd39a7f18490582396046..ac62bdc88882f9acf55502624175acf7c6fb8c08
--- 1/daemon/daemon.mk
--- 2/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@@ -56,22 -57,14 +57,27 @@@ daemon-clean: kresd-clea
  daemon/lua/trust_anchors.lua: daemon/lua/trust_anchors.lua.in
        @$(call quiet,SED,$<) -e "s|@ETCDIR@|$(ETCDIR)|g" $< > $@
  
+ LIBZSCANNER_COMMENTS := \
+       $(shell pkg-config libzscanner --atleast-version=2.4.2 && echo true || echo false)
+ daemon/lua/zonefile.lua: daemon/lua/zonefile.lua.in
+       @$(call quiet,SED,$<) -e "s|@LIBZSCANNER_COMMENTS@|$(LIBZSCANNER_COMMENTS)|g" $< > $@
+ 
  daemon/lua/kres-gen.lua: | $(libkres)
        @echo "WARNING: regenerating $@"
 -      daemon/lua/kres-gen.sh > $@
 +      @# the sed saves some space(s)
 +      daemon/lua/kres-gen.sh | sed 's/    /\t/g' > $@
  .DELETE_ON_ERROR: daemon/lua/kres-gen.lua
  
 -.PHONY: daemon daemon-install daemon-clean
 +# Client
 +ifeq ($(HAS_libedit), yes)
 +kresc_SOURCES := daemon/kresc.c
 +kresc_CFLAGS += -fPIE $(libedit_CFLAGS)
 +kresc_LIBS += $(contrib_TARGET) $(libedit_LIBS)
 +kresc_DEPEND := $(libkres) $(contrib)
 +$(eval $(call make_sbin,kresc,daemon,yes))
 +client: $(kresc)
 +client-install: kresc-install
 +client-clean: kresc-clean
 +endif
 +
 +.PHONY: daemon daemon-install daemon-clean client client-install client-clean

diff --cc daemon/main.c
Simple merge