Gnulib finally relaxed the isatty license, needed as first mentioned here: https://www.redhat.com/archives/libvir-list/2012-February/msg01022.html * .gnulib: Update to latest, for isatty. * bootstrap.conf (gnulib_modules): Add isatty. * bootstrap: Resync from gnulib. --- Not worth including until after 0.9.12 is out, but I thought I'd post it today, since I was investigating another possible gnulib issue. * .gnulib bb2f564...170e1b4 (33):
isatty: relax license to LGPLv2+ stat-size: comment fix Tests for module 'sh-quote'. sh-quote: Improve shell_quote_argv's signature. stdint: document issues with int_fast8_t etc. nanosleep: Fix typo in comment. nanosleep: Avoid guessing wrong when cross-compiling to Linux. link-follow: Avoid guessing wrong when cross-compiling to glibc/Linux. tzset: Avoid guessing wrong when cross-compiling to glibc systems. d-ino: Avoid guessing "no" when cross-compiling to glibc/Linux systems. fseeko-tests, ftello-tests: Avoid "guessing no" when cross-compiling. signbit: Avoid "guessing no" when cross-compiling to glibc systems. strerror: Avoid "guessing no" when cross-compiling to glibc systems. canonicalize[-lgpl]: Avoid "guessing no" when cross-compiling to glibc. gettimeofday: Avoid bad guess when cross-compiling to glibc systems. Tweak last commit. unistd_h: make it easier to avoid sys_types_h lstat: Avoid "guessing no" when cross-compiling to glibc systems. *alloc-gnu, eealloc: Avoid "guessing no" when cross-compiling to glibc. getgroups: Avoid "guessing no" when cross-compiling to glibc systems. chown: Avoid "guessing no" when cross-compiling to glibc systems. Simplify last commit. Avoid "guessing no" guesses when cross-compiling to glibc systems. Say "guessing yes" or "guessing no" when cross-compiling. relocatable-prog: Enable ELF ORIGIN trick also on GNU/kFreeBSD. gnulib-tool: Remove transitional code. getcwd: Fix misindentation. exclude: process exclude and include directives in order exclude: handle wildcards with FNM_NOESCAPE and with trailing \ _Noreturn: future-proof non-GNU and non-MSVC compilers exclude: handle wildcards with FNM_EXTMATCH gnulib-tool: Fix list of authors. bootstrap: support Automake-NG in $buildreq
.gnulib | 2 +- bootstrap | 18 +++++++++++++++++- bootstrap.conf | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index bb2f564..170e1b4 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit bb2f5640d5379c5b4eec2d62341413bbab1aa308 +Subproject commit 170e1b42590631eac8279664ccc0b99ee5a73fb7 diff --git a/bootstrap b/bootstrap index 6b45868..c496d29 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-04-25.17; # UTC +scriptversion=2012-04-26.13; # UTC # Bootstrap this package from checked-out sources. @@ -433,6 +433,22 @@ check_versions() { GZIP) ;; # Do not use $GZIP: it contains gzip options. *) eval "app=\${$appvar-$app}" ;; esac + + # Handle the still-experimental Automake-NG programs specially. + # They remain named as the mainstream Automake programs ("automake", + # and "aclocal") to avoid gratuitous incompatibilities with + # pre-existing usages (by, say, autoreconf, or custom autogen.sh + # scripts), but correctly identify themselves (as being part of + # "GNU automake-ng") when asked their version. + case $app in + automake-ng|aclocal-ng) + app=`echo "$app" | sed 's/-ng$//'` + ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { + echo "$me: Error: '$app' not found or not from Automake-NG" >&2 + ret=1 + continue + } ;; + esac if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. diff --git a/bootstrap.conf b/bootstrap.conf index c6620e5..9b42cbf 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -60,6 +60,7 @@ ignore-value inet_pton intprops ioctl +isatty largefile listen maintainer-makefile -- 1.7.7.6