From 75051fb536aa3a84324f61253765ab0e58e91fa2 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Mon, 16 Sep 2013 11:02:23 +0700 Subject: [PATCH] bootstrap: clean up spurious 'gnulib-cache.m4 missing' error. * gl/build-aux/bootstrap.in (func_reconfigure): Don't show an error when running without gnulib-cache.m4. * bootstrap: Regenerate. Signed-off-by: Gary V. Vaughan --- bootstrap | 4 ++-- gl/build-aux/bootstrap.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap b/bootstrap index 803380a08..2ad3eb9e7 100755 --- a/bootstrap +++ b/bootstrap @@ -2203,7 +2203,7 @@ test extract-trace = "$progname" && func_main "$@" # End: # Set a version string for *this* script. -scriptversion=2013-09-15.06; # UTC +scriptversion=2013-09-16.03; # UTC # 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 @@ -2547,7 +2547,7 @@ func_reconfigure () func_ensure_changelog else $require_gnulib_cache - if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache | + if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null | func_grep_q gitlog-to-changelog then func_ensure_changelog diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in index 550a64293..6463a6c13 100755 --- a/gl/build-aux/bootstrap.in +++ b/gl/build-aux/bootstrap.in @@ -13,7 +13,7 @@ . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace" # Set a version string for *this* script. -scriptversion=2013-09-15.06; # UTC +scriptversion=2013-09-16.03; # UTC # 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 @@ -357,7 +357,7 @@ func_reconfigure () func_ensure_changelog else $require_gnulib_cache - if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache | + if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null | func_grep_q gitlog-to-changelog then func_ensure_changelog -- 2.47.3