Thanks to Joel Granados for noticing that 1.10b wasn't adequate. I've adjusted dependencies both in bootstrap.conf and in configure.ac. I noticed that we were using an old, vc'd-in-parted version of vc-list-files (used as part of "make syntax-check"), that is now incompatible. I've removed it and changed bootstrap.conf so the latest is always pulled from gnulib.
Also, Joel noticed that there was still a bogus gnulib_dir definition in cfg.mk. I removed it, now that I've tweaked gnulib's maint.mk to do the right thing by default. >From dd90af287f158cf87d8d3a315c4010cebea61d91 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 15 May 2009 15:33:49 +0200 Subject: [PATCH 1/4] build: use gnulib's vc-list-files module * bootstrap.conf (gnulib_modules): Add vc-list-files, so we pull this file from gnulib. * build-aux/vc-list-files: Remove now-outdated file. --- bootstrap.conf | 1 + build-aux/vc-list-files | 60 ----------------------------------------------- 2 files changed, 1 insertions(+), 60 deletions(-) delete mode 100755 build-aux/vc-list-files diff --git a/bootstrap.conf b/bootstrap.conf index f6de41c..3c3325f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -48,6 +48,7 @@ gnulib_modules=" safe-read stdbool useless-if-before-free + vc-list-files version-etc-fsf xstrtol " diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files deleted file mode 100755 index b170638..0000000 --- a/build-aux/vc-list-files +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# List the specified version-controlled files. - -# Copyright (C) 2006, 2007 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 2, 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, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -# List the specified version-controlled files. -# With no argument, list them all. -# This script must be run solely from the top of a $srcdir build directory. - -# If there's an argument, it must be a single, "."-relative directory name, -# with no trailing slashes. In mercurial mode, it's used as part of a -# "grep" pattern (prepend "^", append "/"), and in cvs mode, it's simply -# used as an argument to the cvsu script. -# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/ - -include_prefix= -case $# in - 0) ;; - 1) include_prefix=$1 ;; - *) echo "$0: too many arguments" 1>&2; exit 1 ;; -esac - -if test -d .git; then - if test "x$include_prefix" = x; then - git-ls-files - else - git-ls-files | grep "^$include_prefix/" - fi -elif test -d .hg; then - if test "x$include_prefix" = x; then - hg manifest | cut -d ' ' -f 2 - else - hg manifest | cut -d ' ' -f 2 | grep "^$include_prefix/" - fi -elif test -x build-aux/cvsu; then - build-aux/cvsu --find --types=AFGM $include_prefix -else - awk -F/ '{ \ - if (!$1 && $3 !~ /^-/) { \ - f=FILENAME; \ - sub(/CVS\/Entries/, "", f); \ - print f $2; \ - }}' \ - $(find ${*-*} -name Entries -print) /dev/null; -fi -- 1.6.3.1.83.g37eb7 >From 1315a99348a6fb6dc1aa61223f5f0d7d4f4ee383 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 15 May 2009 15:17:20 +0200 Subject: [PATCH 2/4] build: update from gnulib, for newer maint.mk and more * gnulib: Update submodule to latest. --- gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gnulib b/gnulib index 7723389..61893df 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 7723389f98b6159511dea9bd60bf41ec99f0ae14 +Subproject commit 61893df315d491846a8b33af7558bf3cca5410dd -- 1.6.3.1.83.g37eb7 >From dc3961cbbba729534de807a2a7fbd1a6450613c6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 15 May 2009 15:12:19 +0200 Subject: [PATCH 3/4] build: require 1.10c (get it by building from automake.git) * bootstrap.conf (buildreq): Require 1.10c (1.11 is coming soon) for our use of AM_SILENT_RULES. * configure.ac (AM_INIT_AUTOMAKE): Require 1.10c, for our use of AM_SILENT_RULES. Reported by Joel Granados. --- bootstrap.conf | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 3c3325f..5b3b03c 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -109,7 +109,7 @@ mkdir -p gnulib-tests # Build prerequisites buildreq="\ autoconf 2.61 -automake 1.10b +automake 1.10c autopoint - gettext - git 1.4.4 diff --git a/configure.ac b/configure.ac index 53d88b5..5616be8 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ AC_SUBST([LT_CURRENT]) AC_SUBST([LT_REVISION]) AC_SUBST([LT_AGE]) -AM_INIT_AUTOMAKE([1.10b dist-xz color-tests parallel-tests]) +AM_INIT_AUTOMAKE([1.10c dist-xz color-tests parallel-tests]) AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. AC_CANONICAL_HOST -- 1.6.3.1.83.g37eb7 >From b1015f45f431518f0a848a8f71b4fb8dec28a7ef Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 15 May 2009 15:13:14 +0200 Subject: [PATCH 4/4] maint: cfg.mk: remove now-unnecessary gnulib_dir definition * cfg.mk (gnulib_dir): Remove definition, now that gnulib's maint.mk provides the default we want. --- cfg.mk | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 97404ea..b3829c5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -47,10 +47,6 @@ local-checks-to-skip = \ sc_cast_of_argument_to_free \ check-AUTHORS -# The local directory containing the checked-out copy of gnulib used in this -# release. Used solely to get gnulib's SHA1 for the "announcement" target. -gnulib_dir = /gnulib - # Now that we have better (check.mk) tests, make this the default. export VERBOSE = yes -- 1.6.3.1.83.g37eb7 _______________________________________________ parted-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/parted-devel
