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

configure.ac

@@ -81,8 +81,6 @@ AC_ARG_ENABLE([debug],
       xbrief)
         AC_DEFINE([DEBUG_ENABLE_BRIEF], [1], [Enable brief debugging messages.])
         ;;
-      *) 
-         AC_MSG_ERROR([bad value ${enableval} for --enable-debug. Expected: {brief,verbose,details}.])
     esac], [])
     
 # recvmmsg() (valgrind doesn't support it, so disable for debugging)
@@ -118,7 +116,7 @@ AC_SEARCH_LIBS([OpenSSL_add_all_digests], [crypto],[], [AC_MSG_ERROR([libcrypto
 
 # Checks for header files.
 AC_HEADER_RESOLV
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h urcu.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h urcu.h ev.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -141,7 +139,4 @@ AC_CONFIG_FILES([Makefile
                  libknot/Makefile
 		 samples/Makefile
                  src/Makefile])
-
-# Manual pages
-AC_PROG_HELP2MAN(["knotd.8 knotc.8"])
 AC_OUTPUT

m4/acsite.m4

-# check for the presence of help2man
-# if it is available then set MANPAGES to 
-# the list of man page files to create
-#
-# AC_PROG_HELP2MAN(list-of-man-pages)
-
-AC_DEFUN([AC_PROG_HELP2MAN],
-[{
-AC_CHECK_PROGS([HELP2MAN], [help2man])
-if ! test -z "$HELP2MAN" 
-then
-AC_SUBST(MANPAGES, $1)
-fi
-}])

src/Makefile.am

 ACLOCAL_AMFLAGS = -I ../m4
 libexec_PROGRAMS = knot-zcompile unittests unittests-zcompile unittests-libknot-realdata unittests-libknot
 sbin_PROGRAMS = knotc knotd
-man8_MANS=$(MANPAGES)
-EXTRA_DIST=$(MANPAGES)
+MANPAGES = knotc.8 knotd.8
+man8_MANS = knotc.8 knotd.8
+EXTRA_DIST = $(man8_MANS)
 
 # $(YACC) will generate header file
 AM_CFLAGS = -Wall -I../ -I../libknot -DLIBEXECDIR='"$(libexecdir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DSBINDIR='"$(sbindir)"'
@@ -38,8 +39,7 @@ CLEANFILES =					\
 	zlexer.c				\
 	libknotd_la-cf-lex.c			\
 	libknotd_la-cf-parse.c			\
-	libknotd_la-cf-parse.h			\
-	$(MANPAGES)
+	libknotd_la-cf-parse.h
 
 knotc_SOURCES =					\
 	knot/ctl/knotc_main.c
@@ -253,13 +253,6 @@ unittests_libknot_realdata_LDADD = ../libknot/libknot.la libknots.la @LIBOBJS@
 # automake complains on % rules:
 #   `%'-style pattern rules are a GNU make extension
 
-
-knotd.8: knotd$(EXEEXT)
-	$(HELP2MAN) -o $@ $<
-
-knotc.8: knotc$(EXEEXT)
-	$(HELP2MAN) -o $@ $<
-
 tests/libknot/parsed_data.rc: tests/libknot/files/parsed_data
 	../resource.sh tests/libknot/files/parsed_data >$@