55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From d21a2f56602e165d9da4999b32da5c236d767289 Mon Sep 17 00:00:00 2001
|
|
From: Jim Meyering <meyering@fb.com>
|
|
Date: Sun, 25 May 2014 15:28:56 -0700
|
|
Subject: [PATCH 115/125] gnulib: update submodule to latest
|
|
|
|
* gnulib: Update module to latest.
|
|
* bootstrap: Update from gnulib.
|
|
---
|
|
bootstrap | 12 ++++++++++--
|
|
gnulib | 2 +-
|
|
2 files changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/bootstrap b/bootstrap
|
|
index e31d17d..ce90bc4 100755
|
|
--- a/bootstrap
|
|
+++ b/bootstrap
|
|
@@ -1,10 +1,10 @@
|
|
#! /bin/sh
|
|
# Print a version string.
|
|
-scriptversion=2013-08-15.22; # UTC
|
|
+scriptversion=2013-12-05.23; # UTC
|
|
|
|
# Bootstrap this package from checked-out sources.
|
|
|
|
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2003-2014 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
|
|
@@ -551,6 +551,14 @@ if ! printf "$buildreq" | check_versions; then
|
|
fi
|
|
fi
|
|
|
|
+# Warn the user if autom4te appears to be broken; this causes known
|
|
+# issues with at least gettext 0.18.3.
|
|
+probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
|
|
+if test "x$probe" != xhi; then
|
|
+ warn_ "WARNING: your autom4te wrapper eats stdin;"
|
|
+ warn_ "if bootstrap fails, consider upgrading your autotools"
|
|
+fi
|
|
+
|
|
echo "$0: Bootstrapping from checked-out $package sources..."
|
|
|
|
# See if we can use gnulib's git-merge-changelog merge driver.
|
|
diff --git a/gnulib b/gnulib
|
|
index 164ebfe..98ca2c0 160000
|
|
--- a/gnulib
|
|
+++ b/gnulib
|
|
@@ -1 +1 @@
|
|
-Subproject commit 164ebfe612d8460c15d7acf1927faef6943571b6
|
|
+Subproject commit 98ca2c063cfe019b673fd0ce81448c919e9c989c
|
|
--
|
|
1.9.3
|
|
|