Merge branch 'development' of git+ssh://git.nic.cz/projects/labs/cutedns into development

Makefile.am

 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libknot src
+SUBDIRS = libknot src samples

configure.ac

@@ -97,5 +97,6 @@ AC_CHECK_FUNCS([gethostbyname gettimeofday memmove memset munmap regcomp select
 
 AC_CONFIG_FILES([Makefile
                  libknot/Makefile
+		 samples/Makefile
                  src/Makefile])
 AC_OUTPUT

samples/Makefile.am

+edit = sed \
+	-e 's|@version[@]|$(PACKAGE_VERSION)|g' \
+	-e 's|@package[@]|$(PACKAGE_NAME)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@prefix[@]|$(prefix)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g'
+
+knotd.conf: Makefile
+	rm -f $@ $@.tmp
+	srcdir=''; \
+	  test -f ./$@.in || srcdir=$(srcdir)/; \
+	  $(edit) $${srcdir}$@.in >$@.tmp
+	mv $@.tmp $@
+
+knotd.conf: knotd.conf.in
+
+install-data-local: knotd.conf
+	[ -d $(sysconfdir) ] || \
+	  $(INSTALL_DATA) -d $(sysconfdir)
+	[ -f $(sysconfdir)/knotd.conf ] || \
+	  $(INSTALL_DATA) knotd.conf example.com.zone $(sysconfdir)
+
+clean-local:
+	rm -f knotd.conf

samples/knotd.conf.in

+system {
+  identity "@package@ @version@";
+  storage "@localstatedir@/@package@";
+}
+
+interfaces {
+  ipv4 { address 127.0.0.1@53; }
+}
+
+zones {
+  example.com {
+    file "@sysconfdir@/example.com.zone";
+  }
+}
+
+log {
+  syslog { any warning, error, notice; }
+}