Merge branch 'build-manpage'

.gitignore

@@ -22,7 +22,6 @@ TAGS
 radsecproxy
 radsecproxy-conf
 radsecproxy-hash
-radsecproxy.conf.5
 tests/t_fticks
 tests/*.log
 tests/*.trs

ChangeLog

@@ -1,3 +1,8 @@
+changes since 1.7.2
+	Misc:
+	- No longer require docbook2x tools, but include plain manpages
+	- Fail on startup if overlapping clients with different tls blocks
+
 2018-09-03 1.7.2
 	Misc:
 	- Always copy proxy-state attributes in own responses

Makefile.am

@@ -4,10 +4,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-if HAVE_DOCBOOK2X_MAN
-GENMANPAGES = radsecproxy.conf.5
-endif
-
 SUBDIRS = tests
 
 sbin_PROGRAMS = radsecproxy
@@ -59,15 +55,10 @@ EXTRA_DIST = \
 	tools/README tools/naptr-eduroam.sh tools/radsec-dynsrv.sh
 
 ####################
-radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
-	$(DOCBOOK2X_MAN) $<
 
 html: radsecproxy.html radsecproxy-hash.html radsecproxy.conf.html
 
 %.html: %.1
 	groff -mandoc -Thtml $< >$@
 %.html: %.5
 	groff -mandoc -Thtml $< >$@
-
-clean-local:
-	-rm $(GENMANPAGES)

configure.ac

@@ -90,13 +90,6 @@ if test "x$dtls" = "xyes" ; then
   TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_DTLS"
 fi
 
-AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2x-man program to use])
-if test -z "$DOCBOOK2X_MAN" ; then
-  AC_SUBST([DOCBOOK2X_MAN], [docbook2x-man])
-fi
-AC_CHECK_PROG([DOCBOOK2X_MAN_PROG], [$DOCBOOK2X_MAN], [yes])
-AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN_PROG" = "yes")
-
 AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AX_CHECK_SSL