On 08/30/2012 08:15 PM, Jim Meyering wrote: > > I've pushed those. > Great, thanks! Now it's possible to use Automake-NG with GNU parted simply by apllying the following, almost trivial patch (hint hint, nudge nudge ;-)
Regards, Stefano ----->8----->8----->8----->8----->8----->8----->8----->8----->8----->8----->8----- >From cdacc9d0860d8f08b00dce665c3f808d2b78cda7 Mon Sep 17 00:00:00 2001 Message-Id: <cdacc9d0860d8f08b00dce665c3f808d2b78cda7.1346353651.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <[email protected]> Date: Sat, 21 Jul 2012 20:54:46 +0200 Subject: [PATCH] build: support (and require) Automake-NG * configure.ac (AC_PREREQ): Require Autoconf version >= 2.65, since that is the minimal version supported by Automake-NG. (AM_INIT_AUTOMAKE): Add the 'ng' option, to ensure that mainstream Automake is not used by mistake when bootstrapping. Don't add the 'parallel-tests', 'subdir-objects' nor 'color-tests' options, since those are on by default with Automake-NG. Don't add the "minimal required version", since Automake-NG is still in alpha state, and is version is something like '1.12a' at the moment of writing. Also, drop the 'dist-xz' and 'no-dist-gzip' options; they are not supported anymore, and the same effect is now obtained ... * Makefile.am (AM_DIST_FORMATS): ... defining this to 'xz'. * bootstrap.conf ($buildreq): Require 'automake-ng' and 'aclocal-ng'; no longer require mainstream 'automake'. Bump required 'autoconf' version to 2.65. * m4/mkdirp-compat.m4: New file, contain a definition of the macro 'AM_PROG_MKDIR_P' (simply as an alias to the Autoconf-provided macro 'AC_PROG_MKDIR_P'), that is used by the Gettext-provided macro 'AM_PO_SUBDIRS', but which has been removed in Automake-NG (as well as in the master branch of mainline Automake). * .gitignore: Don't ignore 'm4/mkdirp-compat.m4'. Ignore '.am/' directories used internally by Automake-NG generated recipes. Signed-off-by: Stefano Lattarini <[email protected]> --- .gitignore | 2 ++ Makefile.am | 2 ++ bootstrap.conf | 5 +++-- configure.ac | 5 ++--- m4/mkdirp-compat.m4 | 24 ++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 m4/mkdirp-compat.m4 diff --git a/.gitignore b/.gitignore index 054d9ea..ab90a8b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.l[ao] *.trs *~ +.am/ .deps .gdb-history .libs @@ -81,3 +82,4 @@ tests/print-align tests/print-max tests/t*.log tests/test-suite.log +!/m4/mkdirp-compat.m4 diff --git a/Makefile.am b/Makefile.am index 5e52a42..c7b1934 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = po lib include libparted parted partprobe doc debug tests +AM_DIST_FORMATS = xz + EXTRA_DIST = \ .version \ .prev-version \ diff --git a/bootstrap.conf b/bootstrap.conf index 7f4ee53..b05f594 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -129,8 +129,9 @@ mkdir -p gnulib-tests # Build prerequisites buildreq="\ -autoconf 2.63 -automake 1.11.6 +autoconf 2.65 +automake-ng - +aclocal-ng - autopoint - bc - gettext - diff --git a/configure.ac b/configure.ac index 832fc20..f7a11b0 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (C) 1998-2002, 2005-2012 Free Software Foundation, Inc. dnl dnl This file may be modified and/or distributed without restriction. -AC_PREREQ([2.63]) +AC_PREREQ([2.65]) AC_INIT([GNU parted], m4_esyscmd([build-aux/git-version-gen .version]), [[email protected]]) @@ -52,8 +52,7 @@ AC_SUBST([LT_CURRENT]) AC_SUBST([LT_REVISION]) AC_SUBST([LT_AGE]) -AM_INIT_AUTOMAKE([1.11.6 no-dist-gzip dist-xz color-tests parallel-tests - subdir-objects]) +AM_INIT_AUTOMAKE([ng]) AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. AC_CANONICAL_HOST diff --git a/m4/mkdirp-compat.m4 b/m4/mkdirp-compat.m4 new file mode 100644 index 0000000..0cec37f --- /dev/null +++ b/m4/mkdirp-compat.m4 @@ -0,0 +1,24 @@ +# mkdirp-compat.m4 serial 1 + +# Define of the macro 'AM_PROG_MKDIR_P', simply as an alias to +# the Autoconf-provided macro 'AC_PROG_MKDIR_P'. +# AM_PROG_MKDIR_P is still used by the Gettext-provided macro +# 'AM_PO_SUBDIRS', but has been removed in Automake-NG (as well +# as in the master branch of mainline Automake). + +# Copyright (C) 2012 Free Software Foundation, Inc. + +# This program 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. + +# This program 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/>. + +AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P]) -- 1.7.12
