* gnulib-tool: Do not allow --gnu-make in test modes,
since they all require automake.
(func_emit_lib_Makefile_am): Don’t emit automake comment
if --gnu-make.
---
ChangeLog | 6 ++++++
gnulib-tool | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 6b83038e2..02d210ed9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2018-07-04 Paul Eggert <egg...@cs.ucla.edu>
+ gnulib-tool: minor tweaks for --gnu-make
+ * gnulib-tool: Do not allow --gnu-make in test modes,
+ since they all require automake.
+ (func_emit_lib_Makefile_am): Don’t emit automake comment
+ if --gnu-make.
+
regex: work around conditional-dependencies glitch
* modules/regex (Depends-on): Add langinfo.
Without this change, I had problems building an experimental
diff --git a/gnulib-tool b/gnulib-tool
index 447505f6f..fcc585cb0 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1490,6 +1490,11 @@ func_determine_path_separator
if test -z "$pobase" && test -n "$po_domain"; then
func_warning "--po-domain has no effect without a --po-base option"
fi
+ case $mode,$gnu_make in
+ *test*,true)
+ echo "gnulib-tool: --gnu-make not supported when including tests"
+ func_exit 1;;
+ esac
# Canonicalize the inctests variable.
case "$mode" in
import | add-import | remove-import | update)
@@ -3512,7 +3517,8 @@ func_emit_lib_Makefile_am ()
sed_transform_check_PROGRAMS="$sed_noop"
fi
echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
- echo "## Process this file with automake to produce Makefile.in."
+ $gnu_make ||
+ echo "## Process this file with automake to produce Makefile.in."
func_emit_copyright_notice
if test -n "$actioncmd"; then
# The maximum line length (excluding the terminating newline) of any file
--
2.17.1
