Merge remote-tracking branch 'origin/man-pages'

Conflicts:
	configure.ac

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
index 7f4c61b4e7dffbe2d614821b9aa174fd53cf6a29,c09e2024b8385cc174430bf836f926efcdf87e62..c3f7b4a76bd0275320832445d99cc6b3b8f1925c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -54,8 -56,23 +56,17 @@@ AC_PATH_PROG([XSLTPROC], [xsltproc]
  # Python
  AM_PATH_PYTHON([2.7])
  
 -# BIND nsupdate
 -AC_CHECK_TOOL([NSUPDATE], [nsupdate])
 -if test -z "${NSUPDATE}"; then
 -      AC_MSG_ERROR([*** nsupdate not found])
 -fi
 -
  save_LIBS="$LIBS"
  
+ # ------------------------------------------------------------------------------
+ have_manpages=no
+ AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages],
+       [do not install man pages]))
+ AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
+ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
+ 
+ # ------------------------------------------------------------------------------
+ 
  AC_CONFIG_FILES([
        Makefile
        po/Makefile.in
@@@ -66,6 -83,10 +77,8 @@@ AC_OUTPU
  AC_MSG_RESULT([
        ${PACKAGE_NAME} ${VERSION}
  
 -      prefix             : ${prefix}
 -      sysconfdir         : ${sysconfdir}
 -
 -      nsupdate           : ${NSUPDATE}
 +      prefix            : ${prefix}
 +      sysconfdir        : ${sysconfdir}
+ 
+       Generate man-pages : ${have_manpages}
  ])