From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 8 Feb 2015 22:05:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/man-pages'
X-Git-Tag: 006~1
X-Git-Url: http://git.ipfire.org/?p=ddns.git;a=commitdiff_plain;h=77eb26be532d9860691ecdf0fc6f224014b16bd0

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

Conflicts:
	configure.ac
---

77eb26be532d9860691ecdf0fc6f224014b16bd0
diff --cc configure.ac
index 7f4c61b,c09e202..c3f7b4a
--- a/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}
  ])