[svn] commit: r1510 - in /trunk: ./ src/bin/auth/ src/bin/bind10/ src/bin/bindctl/ src/bin/cfgmgr/ src/bin/cmdctl/ src/bin/host/ src/bin/loadzone/ src/bin/msgq/ src/bin/usermgr/ src/bin/xfrin/
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 18 12:52:31 UTC 2010
Author: jreed
Date: Thu Mar 18 12:52:31 2010
New Revision: 1510
Log:
Only regenerate manual pages if configure is ran with --enable-man.
Modified:
trunk/configure.ac
trunk/src/bin/auth/Makefile.am
trunk/src/bin/bind10/Makefile.am
trunk/src/bin/bindctl/Makefile.am
trunk/src/bin/cfgmgr/Makefile.am
trunk/src/bin/cmdctl/Makefile.am
trunk/src/bin/host/Makefile.am
trunk/src/bin/loadzone/Makefile.am
trunk/src/bin/msgq/Makefile.am
trunk/src/bin/usermgr/Makefile.am
trunk/src/bin/xfrin/Makefile.am
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Mar 18 12:52:31 2010
@@ -251,7 +251,10 @@
AC_CHECK_HEADERS([boost/shared_ptr.hpp],,
AC_MSG_ERROR([Missing required header files.]))
-# Checks for library functions.
+AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man],
+ [regenerate man pages [default=no]])] ,enable_man=yes, enable_man=no)
+
+AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
AC_CONFIG_FILES([Makefile
src/Makefile
Modified: trunk/src/bin/auth/Makefile.am
==============================================================================
--- trunk/src/bin/auth/Makefile.am (original)
+++ trunk/src/bin/auth/Makefile.am Thu Mar 18 12:52:31 2010
@@ -14,8 +14,12 @@
man_MANS = b10-auth.8
EXTRA_DIST = $(man_MANS) b10-auth.xml
+if ENABLE_MAN
+
b10-auth.8: b10-auth.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-auth.xml
+
+endif
pkglibexec_PROGRAMS = b10-auth
b10_auth_SOURCES = auth_srv.cc auth_srv.h
Modified: trunk/src/bin/bind10/Makefile.am
==============================================================================
--- trunk/src/bin/bind10/Makefile.am (original)
+++ trunk/src/bin/bind10/Makefile.am Thu Mar 18 12:52:31 2010
@@ -10,8 +10,12 @@
man_MANS = bind10.8
EXTRA_DIST += $(man_MANS) bind10.xml
+if ENABLE_MAN
+
bind10.8: bind10.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bind10.xml
+
+endif
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
Modified: trunk/src/bin/bindctl/Makefile.am
==============================================================================
--- trunk/src/bin/bindctl/Makefile.am (original)
+++ trunk/src/bin/bindctl/Makefile.am Thu Mar 18 12:52:31 2010
@@ -12,8 +12,12 @@
CLEANFILES = bindctl
+if ENABLE_MAN
+
bindctl.1: bindctl.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bindctl.xml
+
+endif
bindctl: bindctl-source.py
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
Modified: trunk/src/bin/cfgmgr/Makefile.am
==============================================================================
--- trunk/src/bin/cfgmgr/Makefile.am (original)
+++ trunk/src/bin/cfgmgr/Makefile.am Thu Mar 18 12:52:31 2010
@@ -10,8 +10,12 @@
man_MANS = b10-cfgmgr.8
EXTRA_DIST = $(man_MANS) b10-cfgmgr.xml
+if ENABLE_MAN
+
b10-cfgmgr.8: b10-cfgmgr.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cfgmgr.xml
+
+endif
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
Modified: trunk/src/bin/cmdctl/Makefile.am
==============================================================================
--- trunk/src/bin/cmdctl/Makefile.am (original)
+++ trunk/src/bin/cmdctl/Makefile.am Thu Mar 18 12:52:31 2010
@@ -19,8 +19,12 @@
man_MANS = b10-cmdctl.8
EXTRA_DIST += $(man_MANS) b10-cmdctl.xml
+if ENABLE_MAN
+
b10-cmdctl.8: b10-cmdctl.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl.xml
+
+endif
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
Modified: trunk/src/bin/host/Makefile.am
==============================================================================
--- trunk/src/bin/host/Makefile.am (original)
+++ trunk/src/bin/host/Makefile.am Thu Mar 18 12:52:31 2010
@@ -12,5 +12,9 @@
#man_MANS = host.1
#EXTRA_DIST = $(man_MANS) host.xml
#
+#if ENABLE_MAN
+#
#host.1: host.xml
# xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/host.xml
+#
+#endif
Modified: trunk/src/bin/loadzone/Makefile.am
==============================================================================
--- trunk/src/bin/loadzone/Makefile.am (original)
+++ trunk/src/bin/loadzone/Makefile.am Thu Mar 18 12:52:31 2010
@@ -5,8 +5,12 @@
man_MANS = b10-loadzone.8
EXTRA_DIST = $(man_MANS) b10-loadzone.xml
+if ENABLE_MAN
+
b10-loadzone.8: b10-loadzone.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-loadzone.xml
+
+endif
b10-loadzone: b10-loadzone.py
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
Modified: trunk/src/bin/msgq/Makefile.am
==============================================================================
--- trunk/src/bin/msgq/Makefile.am (original)
+++ trunk/src/bin/msgq/Makefile.am Thu Mar 18 12:52:31 2010
@@ -7,8 +7,12 @@
man_MANS = msgq.8
EXTRA_DIST = $(man_MANS) msgq.xml
+if ENABLE_MAN
+
msgq.8: msgq.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/msgq.xml
+
+endif
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
Modified: trunk/src/bin/usermgr/Makefile.am
==============================================================================
--- trunk/src/bin/usermgr/Makefile.am (original)
+++ trunk/src/bin/usermgr/Makefile.am Thu Mar 18 12:52:31 2010
@@ -7,8 +7,12 @@
man_MANS = b10-cmdctl-usermgr.8
EXTRA_DIST = $(man_MANS) b10-cmdctl-usermgr.xml
+if ENABLE_MAN
+
b10-cmdctl-usermgr.8: b10-cmdctl-usermgr.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl-usermgr.xml
+
+endif
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
Modified: trunk/src/bin/xfrin/Makefile.am
==============================================================================
--- trunk/src/bin/xfrin/Makefile.am (original)
+++ trunk/src/bin/xfrin/Makefile.am Thu Mar 18 12:52:31 2010
@@ -12,8 +12,12 @@
man_MANS = b10-xfrin.8
EXTRA_DIST += $(man_MANS) b10-xfrin.xml
+if ENABLE_MAN
+
b10-xfrin.8: b10-xfrin.xml
xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-xfrin.xml
+
+endif
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
More information about the bind10-changes
mailing list