diff options
| -rwxr-xr-x | bootstrap | 15 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 16 deletions
@@ -833,21 +833,6 @@ version_controlled_file() { fi } -# Avoid boostrap failure with gettext/autopoint bug in version 0.18.3.1 -# http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html -# Remove in 2015 when distros have upgraded to >= 0.18.3.2 -autopoint_version=$(get_version $AUTOPOINT) -# Note autopoint returns version 0.18.3 for version 0.18.3.1 -if test "$autopoint_version" = '0.18.3' ; then - if test "$package" = 'coreutils' ; then - test -e 'm4/cu-progs.m4' || touch 'm4/cu-progs.m4' - fi - if ! test -e 'build-aux/git-version-gen' ; then - printf "#!/bin/sh\n" > 'build-aux/git-version-gen' - chmod a+x 'build-aux/git-version-gen' - fi -fi - # NOTE: we have to be careful to run both autopoint and libtoolize # before gnulib-tool, since gnulib-tool is likely to provide newer # versions of files "installed" by these two programs. diff --git a/configure.ac b/configure.ac index e6086111d..c1599831c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl Written by Jim Meyering. -AC_PREREQ([2.64]) +AC_PREREQ([2.69]) # Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which # indicates that it is built from the 219th delta (in _some_ repository) |