From: Gary V. Vaughan <g...@gnu.org>
* libltdl/config/announce-gen.m4sh: Add support for gnulib
announce-gen options, previously missing from our m4sh
implementation, and enforce specifying --gnulib-version when
`gnulib' is listed in --bootstrap-tools.
---
ChangeLog | 8 ++++++++
libltdl/config/announce-gen.m4sh | 26 +++++++++++++++++++++-----
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6c2447..c3287b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-26 Gary V. Vaughan <g...@gnu.org>
+
+ Add --gnulib-version and --news options to announce-gen.
+ * libltdl/config/announce-gen.m4sh: Add support for gnulib
+ announce-gen options, previously missing from our m4sh
+ implementation, and enforce specifying --gnulib-version when
+ `gnulib' is listed in --bootstrap-tools.
+
2010-08-29 Peter Rosin <p...@lysator.liu.se>
Fix typo when renaming path conversion functions.
diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index 38e6232..fafa2c7 100644
--- a/libltdl/config/announce-gen.m4sh
+++ b/libltdl/config/announce-gen.m4sh
@@ -32,9 +32,12 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
# autoconf,automake,bison,gnulib
# --current-version=VER override current release version number
# --debug enable verbose shell tracing
+# --gnulib-version=VER set the version string if gnulib is named
+# in the --bootstrap-tools list
# --gpg-key-id=ID gnupg ID of signature key for release files
# -h STRING --header=STRING insert mail header into announcement
# -m STRING --message=STRING insert into message blurb for announcement
+# --news=NEWS_FILE path to the NEWS file [../NEWS]
# -c --no-print-checksums do not emit MD5 and SHA1 checksums
# -o --output output to stdout
# --package-name=NAME override default package name
@@ -128,13 +131,18 @@ M4SH_GETOPTS(
mailnotify_flags="${mailnotify_flags+$mailnotify_flags }$opt"],
[!], [--bootstrap-tools|--bootstrap|--boots], [], [
for tool in `echo "$optarg"|$SED 's|,| |g'`; do
- ($tool --version) >/dev/null 2>&1 || {
- func_error "$opt \`$optarg' does not respond to --version
option."
- cmd_exit=exit
- }
- done],
+ test gnulib = "$tool" ||
+ ($tool --version) >/dev/null 2>&1 || {
+ func_error "$opt \`$optarg' does not respond to --version
option."
+ cmd_exit=exit
+ }
+ done
+ # squash spaces so that delimiter is just `,' and nothing else:
+ opt_bootstrap_tools=`echo "$optarg" |$SED 's|, *|,|g'`],
[!], [--current-version|--current|--curr], [...@version@], [],
+ [!], [--gnulib-version|--gnulib], [], [],
[!], [--gpg-key-id|--gpg], [], [],
+ [!], [--news], [], [],
[], [--no-print-checksums], [], [],
[!], [--previous-version|--previous|--prev], [...@lastrelease@], [],
[!], [--release-type], [], [],
@@ -152,6 +160,14 @@ M4SH_GETOPTS(
func_error "you must specify some tools with --bootstrap-tools."
exit_cmd=exit
}
+ case ,gnulib, in
+ ,$opt_bootstrap_tools,)
+ test -n "$opt_gnulib_version" || {
+ func_error "you must specify a --gnulib-version when gnulib is
in --bootstrap-tools."
+ exit_cmd=exit
+ }
+ ;;
+ esac
# validate $opt_blurb and $opt_message
test -n "$opt_blurb" && test -n "$opt_message" && {
--
1.7.2.2
