[SCM] GNU Inetutils branch, master, updated. inetutils-1_6-137-g8baafba

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  8baafba83dfb49037620e095f6ea073a3877431e (commit)
      from  1699b8024fab54668d85940768c03424ae870f5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8baafba83dfb49037620e095f6ea073a3877431e


commit 8baafba83dfb49037620e095f6ea073a3877431e
Author: Simon Josefsson <address@hidden>
Date:   Tue Dec 8 11:53:02 2009 +0100

    Only enable building of man pages for tools that are enabled.

diff --git a/ChangeLog b/ChangeLog
index 403ad3c..081c41d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-08  Simon Josefsson  <address@hidden>
 
+       * man/Makefile.am: Only enable building of man pages for tools
+       that are enabled.  Reported by Ludovic Courtès <address@hidden>.
+       * am/enable.m4: Specify a conditional for every tool.
+
+2009-12-08  Simon Josefsson  <address@hidden>
+
        * man/Makefile.am: Rename *.x files to *.h2m, to use the same
        extension used in the help2man package itself.  It also a more
        symbolic name than *.x.
diff --git a/am/enable.m4 b/am/enable.m4
index a24ec5f..98b4648 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -31,6 +31,7 @@ else
 fi;]
   AC_SUBST([$1_BUILD])
   AC_SUBST([$1_INSTALL_HOOK])
+  AM_CONDITIONAL([ENABLE_$1], test "$enable_$1" = yes)
 ])
 
 AC_DEFUN([IU_ENABLE_CLIENT], [IU_ENABLE_FOO($1, clients)])
diff --git a/man/Makefile.am b/man/Makefile.am
index 97900ea..c827857 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -16,15 +16,99 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-dist_man1_MANS = hostname.1 ifconfig.1 inetd.1 ftp.1 ftpd.1 logger.1   \
-       ping.1 rcp.1 rexec.1 rexecd.1 rlogin.1 rlogind.1 rsh.1 rshd.1   \
-       syslogd.1 talk.1 talkd.1 telnet.1 telnetd.1 traceroute.1        \
-       uucpd.1 whois.1
+dist_man1_MANS =
 
 # FIXME: ping6 ifconfig tftp
 
-man_aux = $(dist_man1_MANS:.1=.h2m)
-EXTRA_DIST = $(man_aux)
+if ENABLE_hostname
+dist_man1_MANS += hostname.1
+endif
+
+if ENABLE_ifconfig
+dist_man1_MANS += ifconfig.1
+endif
+
+if ENABLE_inetd
+dist_man1_MANS += inetd.1
+endif
+
+if ENABLE_ftp
+dist_man1_MANS += ftp.1
+endif
+
+if ENABLE_ftpd
+dist_man1_MANS += ftpd.1
+endif
+
+if ENABLE_logger
+dist_man1_MANS += logger.1
+endif
+
+if ENABLE_ping
+dist_man1_MANS += ping.1
+endif
+
+if ENABLE_rcp
+dist_man1_MANS += rcp.1
+endif
+
+if ENABLE_rexec
+dist_man1_MANS += rexec.1
+endif
+
+if ENABLE_rexecd
+dist_man1_MANS += rexecd.1
+endif
+
+if ENABLE_rlogin
+dist_man1_MANS += rlogin.1
+endif
+
+if ENABLE_rlogind
+dist_man1_MANS += rlogind.1
+endif
+
+if ENABLE_rsh
+dist_man1_MANS += rsh.1
+endif
+
+if ENABLE_rshd
+dist_man1_MANS += rshd.1
+endif
+
+if ENABLE_syslogd
+dist_man1_MANS += syslogd.1
+endif
+
+if ENABLE_talk
+dist_man1_MANS += talk.1
+endif
+
+if ENABLE_talkd
+dist_man1_MANS += talkd.1
+endif
+
+if ENABLE_telnet
+dist_man1_MANS += telnet.1
+endif
+
+if ENABLE_telnetd
+dist_man1_MANS += telnetd.1
+endif
+
+if ENABLE_traceroute
+dist_man1_MANS += traceroute.1
+endif
+
+if ENABLE_uucpd
+dist_man1_MANS += uucpd.1
+endif
+
+if ENABLE_whois
+dist_man1_MANS += whois.1
+endif
+
+EXTRA_DIST = $(dist_man1_MANS:.1=.h2m)
 
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    6 +++
 am/enable.m4    |    1 +
 man/Makefile.am |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 97 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils