diff options
| author | Jim Meyering <meyering@fb.com> | 2014-09-06 19:39:29 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2014-11-30 18:59:33 -0800 |
| commit | 57b535656c5ac8b7a8486876176de7b6c7a5c428 (patch) | |
| tree | 95dcabe962601d248e4bc01c731b52249cab9bb4 | |
| parent | 7a1a80603c2ff6142c2372fcd31b9f8ce9983be8 (diff) | |
| download | sed-57b535656c5ac8b7a8486876176de7b6c7a5c428.tar.gz | |
maint: begin to modernize configure.ac
* configure.ac: Turn on silent rules, by default.
Use git-derived versions all the time. Required a new, signed
v4.2.2 tag, which I've pushed.
Distribute .tar.xz tarballs, not .bzip2 or .gz.
* Makefile.am (AUTOMAKE_OPTIONS): Remove.
* bootstrap.conf (gnulib_modules): Add git-version-gen.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | bootstrap.conf | 1 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3d2172b..cdf5db4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Automake requirements -AUTOMAKE_OPTIONS = gnits 1.10 dist-bzip2 ACLOCAL_AMFLAGS = -I m4 PACKAGE = sed diff --git a/bootstrap.conf b/bootstrap.conf index 77fd11c..2cc519e 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -31,6 +31,7 @@ fwriting getdelim getopt gettext-h +git-version-gen gitlog-to-changelog localcharset mbrlen diff --git a/configure.ac b/configure.ac index 1122a72..4eec46e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,13 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. -AC_INIT([GNU sed], 4.2.2, bug-sed@gnu.org, sed) +AC_INIT([GNU sed], + m4_esyscmd([build-aux/git-version-gen .tarball-version]), + [bug-sed@gnu.org]) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) AC_PREREQ(2.62) -AM_INIT_AUTOMAKE([1.11.1 parallel-tests]) +AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz color-tests parallel-tests]) +AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. SED_FEATURE_VERSION=4.2.2 AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", |