[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-272-g5d83e
|
From: |
Mats Erik Andersson |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-272-g5d83e7c |
|
Date: |
Thu, 11 Apr 2013 11:30:28 +0000 |
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 5d83e7c8c1c96de49972fd0d8dd687a64da0af09 (commit)
via 46d208a7f5925a09b7d756447a2b27490f424260 (commit)
from ef002d90516083a93d34d341f383153eadd1c409 (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=5d83e7c8c1c96de49972fd0d8dd687a64da0af09
commit 5d83e7c8c1c96de49972fd0d8dd687a64da0af09
Author: Mats Erik Andersson <address@hidden>
Date: Thu Apr 11 12:16:54 2013 +0200
Working distcheck target.
diff --git a/ChangeLog b/ChangeLog
index 0b6b221..e2360a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2013-04-11 Mats Erik Andersson <address@hidden>
+ Working distcheck target.
+
+ * Makefile.am (BUILT_SOURCES): Replace $(top_srcdir)
+ by $(top_builddir).
+ (DISTCLEANFILES): Add `$(top_builddir)/.version' to list.
+ ($(top_builddir)/.version): Move target to build directory.
+
+2013-04-11 Mats Erik Andersson <address@hidden>
+
Summary printout is a config.status command.
* configure.ac (AC_CONFIG_FILES): Add summary.sh to list.
diff --git a/Makefile.am b/Makefile.am
index 698d339..0c78a7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,10 +27,11 @@ SUBDIRS = lib \
tests
DISTCLEANFILES = pathdefs.make paths.defs \
+ $(top_builddir)/.version \
$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION).tar.xz
-BUILT_SOURCES = $(top_srcdir)/.version
-$(top_srcdir)/.version:
+BUILT_SOURCES = $(top_builddir)/.version
+$(top_builddir)/.version:
echo $(VERSION) > address@hidden && mv address@hidden $@
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=46d208a7f5925a09b7d756447a2b27490f424260
commit 46d208a7f5925a09b7d756447a2b27490f424260
Author: Mats Erik Andersson <address@hidden>
Date: Thu Apr 11 02:51:46 2013 +0200
Summary printout.
diff --git a/.gitignore b/.gitignore
index 5ed6df7..4373037 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,5 @@ pathdefs.make
paths.defs
stamp-h.in
stamp-h1
+summary.sh
!lib/Makefile.am
diff --git a/ChangeLog b/ChangeLog
index 3a5ad04..0b6b221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-11 Mats Erik Andersson <address@hidden>
+
+ Summary printout is a config.status command.
+
+ * configure.ac (AC_CONFIG_FILES): Add summary.sh to list.
+ (AC_CONFIG_COMMANDS): New command `summary'.
+ (AC_MSG_NOTICE) <summary>: Removed.
+ * .gitignore: Add summary.sh to list.
+ * Makefile.am (EXTRA_DIST): Add summary.sh.in.
+ * summary.sh.in: New file.
+ * am/enable.m4 (IU_ENABLE_FOO): Publish `$1_PROPS'
+ and `enable_$1' via AC_SUBST.
+
2013-04-10 Mats Erik Andersson <address@hidden>
* doc/inetutils.texi <main menu>: Order invocation
diff --git a/Makefile.am b/Makefile.am
index 3efee5f..698d339 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
-EXTRA_DIST = paths ChangeLog.0
+EXTRA_DIST = paths ChangeLog.0 summary.sh.in
SUBDIRS = lib \
libinetutils libtelnet libicmp libls \
diff --git a/am/enable.m4 b/am/enable.m4
index 7076fbf..9f5d644 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -32,6 +32,8 @@ else
fi;]
AC_SUBST([$1_BUILD])
AC_SUBST([$1_INSTALL_HOOK])
+ AC_SUBST([$1_PROPS])
+ AC_SUBST([enable_$1])
AM_CONDITIONAL([ENABLE_$1], test "$enable_$1" = yes)
])
diff --git a/configure.ac b/configure.ac
index 6c6de9f..22e42ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -987,6 +987,7 @@ esac
AC_CONFIG_FILES([
Makefile
+summary.sh
lib/Makefile
libinetutils/Makefile
libtelnet/Makefile
@@ -1008,7 +1009,8 @@ man/Makefile
tests/Makefile
confpaths.h:confpaths.h.in
])
-AC_OUTPUT
+
+AC_CONFIG_COMMANDS([summary], [sh ./summary.sh])
# Collect printable information on each
# available (i.e., reportable) target.
@@ -1061,39 +1063,4 @@ ftp_PROPS="${ftp_PROPS:+$ftp_PROPS }$LIBREADLINE"
talk_PROPS="${talk_PROPS:+$talk_PROPS }$LIBCURSES"
-# Collect informational status.
-AC_MSG_NOTICE([summary of build decisions:
-
- Clients:
-
- dnsdomainname ${enable_dnsdomainname}
- ftp ${enable_ftp}${ftp_BUILD:+ $ftp_PROPS}
- hostname ${enable_hostname}
- ifconfig ${enable_ifconfig}
- logger ${enable_logger}
- ping ${enable_ping}${ping_BUILD:+ $ping_PROPS}
- ping6 ${enable_ping6}${ping6_BUILD:+ $ping_PROPS}
- rcp ${enable_rcp}${rcp_BUILD:+ $rcp_PROPS}
- rexec ${enable_rexec}
- rlogin ${enable_rlogin}${rlogin_BUILD:+ $rlogin_PROPS}
- rsh ${enable_rsh}${rsh_BUILD:+ $rsh_PROPS}
- talk ${enable_talk}${talk_BUILD:+ $talk_PROPS}
- telnet ${enable_telnet}${telnet_BUILD:+ $telnet_PROPS}
- tftp ${enable_tftp}
- traceroute ${enable_traceroute}\
-${traceroute_BUILD:+ $traceroute_PROPS}
- whois ${enable_whois}
-
- Servers:
-
- ftpd ${enable_ftpd}${ftpd_BUILD:+ $ftpd_PROPS}
- inetd ${enable_inetd}
- rexecd ${enable_rexecd}${rexecd_BUILD:+ $rexecd_PROPS}
- rlogind ${enable_rlogind}${rlogind_BUILD:+ $rlogind_PROPS}
- rshd ${enable_rshd}${rshd_BUILD:+ $rshd_PROPS}
- syslogd ${enable_syslogd}
- talkd ${enable_talkd}
- telnetd ${enable_telnetd}${telnetd_BUILD:+ $telnetd_PROPS}
- tftpd ${enable_tftpd}
- uucpd ${enable_uucpd}
-])
+AC_OUTPUT
diff --git a/summary.sh.in b/summary.sh.in
new file mode 100644
index 0000000..ed65209
--- /dev/null
+++ b/summary.sh.in
@@ -0,0 +1,137 @@
+#!/bin/sh
+#
+# Copyright (C) 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Inetutils.
+#
+# GNU Inetutils is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see `http://www.gnu.org/licenses/'.
+
+# Template for printing a summary of program configurations.
+
address@hidden@
address@hidden@
+dnsdomainname_PROPS="@dnsdomainname_PROPS@"
address@hidden@
address@hidden@
+ftp_PROPS="@ftp_PROPS@"
address@hidden@
address@hidden@
+hostname_PROPS="@hostname_PROPS@"
address@hidden@
address@hidden@
+ifconfig_PROPS="@ifconfig_PROPS@"
address@hidden@
address@hidden@
+logger_PROPS="@logger_PROPS@"
address@hidden@
address@hidden@
+ping_PROPS="@ping_PROPS@"
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+rcp_PROPS="@rcp_PROPS@"
address@hidden@
address@hidden@
+rexec_PROPS="@rexec_PROPS@"
address@hidden@
address@hidden@
+rlogin_PROPS="@rlogin_PROPS@"
address@hidden@
address@hidden@
+rsh_PROPS="@rsh_PROPS@"
address@hidden@
address@hidden@
+talk_PROPS="@talk_PROPS@"
address@hidden@
address@hidden@
+telnet_PROPS="@telnet_PROPS@"
address@hidden@
address@hidden@
+tftp_PROPS="@tftp_PROPS@"
address@hidden@
address@hidden@
+traceroute_PROPS="@traceroute_PROPS@"
address@hidden@
address@hidden@
+whois_PROPS="@whois_PROPS@"
address@hidden@
address@hidden@
+ftpd_PROPS="@ftpd_PROPS@"
address@hidden@
address@hidden@
+inetd_PROPS="@inetd_PROPS@"
address@hidden@
address@hidden@
+rexecd_PROPS="@rexecd_PROPS@"
address@hidden@
address@hidden@
+rlogind_PROPS="@rlogind_PROPS@"
address@hidden@
address@hidden@
+rshd_PROPS="@rshd_PROPS@"
address@hidden@
address@hidden@
+syslogd_PROPS="@syslogd_PROPS@"
address@hidden@
address@hidden@
+talkd_PROPS="@talkd_PROPS@"
address@hidden@
address@hidden@
+telnetd_PROPS="@telnetd_PROPS@"
address@hidden@
address@hidden@
+tftpd_PROPS="@tftpd_PROPS@"
address@hidden@
address@hidden@
+uucpd_PROPS="@uucpd_PROPS@"
+
+# Collect informational status.
+cat <<EOT
+Summary of build decisions:
+
+ Clients:
+
+ dnsdomainname ${enable_dnsdomainname}
+ ftp ${enable_ftp}${ftp_BUILD:+ $ftp_PROPS}
+ hostname ${enable_hostname}
+ ifconfig ${enable_ifconfig}
+ logger ${enable_logger}
+ ping ${enable_ping}${ping_BUILD:+ $ping_PROPS}
+ ping6 ${enable_ping6}${ping6_BUILD:+ $ping_PROPS}
+ rcp ${enable_rcp}${rcp_BUILD:+ $rcp_PROPS}
+ rexec ${enable_rexec}
+ rlogin ${enable_rlogin}${rlogin_BUILD:+ $rlogin_PROPS}
+ rsh ${enable_rsh}${rsh_BUILD:+ $rsh_PROPS}
+ talk ${enable_talk}${talk_BUILD:+ $talk_PROPS}
+ telnet ${enable_telnet}${telnet_BUILD:+ $telnet_PROPS}
+ tftp ${enable_tftp}
+ traceroute ${enable_traceroute}\
+${traceroute_BUILD:+ $traceroute_PROPS}
+ whois ${enable_whois}
+
+ Servers:
+
+ ftpd ${enable_ftpd}${ftpd_BUILD:+ $ftpd_PROPS}
+ inetd ${enable_inetd}
+ rexecd ${enable_rexecd}${rexecd_BUILD:+ $rexecd_PROPS}
+ rlogind ${enable_rlogind}${rlogind_BUILD:+ $rlogind_PROPS}
+ rshd ${enable_rshd}${rshd_BUILD:+ $rshd_PROPS}
+ syslogd ${enable_syslogd}
+ talkd ${enable_talkd}
+ telnetd ${enable_telnetd}${telnetd_BUILD:+ $telnetd_PROPS}
+ tftpd ${enable_tftpd}
+ uucpd ${enable_uucpd}
+EOT
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
ChangeLog | 22 +++++++++
Makefile.am | 7 ++-
am/enable.m4 | 2 +
configure.ac | 41 ++---------------
summary.sh.in | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 170 insertions(+), 40 deletions(-)
create mode 100644 summary.sh.in
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-272-g5d83e7c,
Mats Erik Andersson <=