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

Conflicts:
	configure.ac

diff --combined Makefile.am
index 2ca1c3b0accd7e6e273ca3e915a2866cdc24ae35,0ee85ae48f0c4f8b9f3dc2a05a5ded34943cbd9b..a783064e887694ae836280b6cec32ac05e6e47cc
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -37,6 -37,7 +37,7 @@@ configsdir = $(sysconfdir)/ddn
  CLEANFILES =
  DISTCLEANFILES =
  EXTRA_DIST =
+ noinst_DATA =
  
  @INTLTOOL_POLICY_RULE@
  
@@@ -46,6 -47,12 +47,12 @@@ update-po
  
  # ------------------------------------------------------------------------------
  
+ AM_V_XSLT   = $(AM_V_XSLT_$(V))
+ AM_V_XSLT_  = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
+ AM_V_XSLT_0 = @echo "  XSLT    " $@;
+ 
+ # ------------------------------------------------------------------------------
+ 
  dist_doc_DATA = \
        COPYING
  
@@@ -66,7 -73,6 +73,7 @@@ dist_configs_DATA = 
  ddns_PYTHON = \
        src/ddns/__init__.py \
        src/ddns/__version__.py \
 +      src/ddns/database.py \
        src/ddns/errors.py \
        src/ddns/i18n.py \
        src/ddns/providers.py \
@@@ -76,6 -82,58 +83,58 @@@ ddnsdir = $(pythondir)/ddn
  
  # ------------------------------------------------------------------------------
  
+ if ENABLE_MANPAGES
+ MANPAGES = \
+       man/ddns.1 \
+       man/ddns.conf.5
+ 
+ MANPAGES_XML  = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MANPAGES)))
+ MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))
+ 
+ man: $(MANPAGES) $(MANPAGES_HTML)
+ 
+ man_MANS = \
+       $(MANPAGES)
+ 
+ noinst_DATA += \
+       $(MANPAGES_HTML)
+ 
+ CLEANFILES += \
+       $(man_MANS) \
+       $(MANPAGES_HTML)
+ 
+ EXTRA_DIST += \
+       $(MANPAGES_XML) \
+       man/custom-html.xsl
+ 
+ XSLTPROC_FLAGS = \
+       --nonet \
+       --stringparam man.output.quietly 1 \
+       --stringparam funcsynopsis.style ansi \
+       --stringparam man.th.extra1.suppress 1 \
+       --stringparam man.authors.section.enabled 1 \
+       --stringparam man.copyright.section.enabled 1
+ 
+ XSLTPROC_COMMAND_MAN = \
+       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
+               http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+ 
+ XSLTPROC_COMMAND_HTML = \
+       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+ 
+ man/%.1: man/%.xml
+       $(XSLTPROC_COMMAND_MAN)
+ 
+ man/%.5: man/%.xml
+       $(XSLTPROC_COMMAND_MAN)
+ 
+ man/%.html: man/%.xml man/custom-html.xsl
+       $(XSLTPROC_COMMAND_HTML)
+ 
+ endif
+ 
+ # ------------------------------------------------------------------------------
+ 
  substitutions = \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \

diff --combined configure.ac
index 7f4c61b4e7dffbe2d614821b9aa174fd53cf6a29,c09e2024b8385cc174430bf836f926efcdf87e62..c3f7b4a76bd0275320832445d99cc6b3b8f1925c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -21,7 -21,7 +21,7 @@@
  AC_PREREQ([2.64])
  
  AC_INIT([ddns],
 -      [003],
 +      [005],
        [info@ipfire.org],
        [ddns],
        [http://git.ipfire.org/?p=oddments/ddns.git;a=summary])
@@@ -51,11 -51,28 +51,22 @@@ AC_PROG_LN_
  AC_PROG_MKDIR_P
  AC_PROG_SED
  
+ 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}
  ])