summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xgnulib-tool4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2ab3c5e61..2fa97a2471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-05-15 Bruno Haible <bruno@clisp.org>
+ gnulib-tool: Fix generated code when libtests contains module 'alloca'.
+ * gnulib-tool (func_emit_tests_Makefile_am): For libtests.a, use
+ @ALLOCA@, not @LTALLOCA@.
+
+2017-05-15 Bruno Haible <bruno@clisp.org>
+
sys_select: Avoid "was expanded before it was required" warning.
* modules/sys_select (configure.ac): Require, not invoke,
gl_HEADER_SYS_SELECT.
diff --git a/gnulib-tool b/gnulib-tool
index 5dd77f7f15..f3463b67e8 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3828,8 +3828,8 @@ func_emit_tests_Makefile_am ()
-e "$sed_transform_check_PROGRAMS" \
-e "$sed_replace_include_guard_prefix"
if $use_libtests && test "$module" = 'alloca'; then
- echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@"
- echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@"
+ echo "libtests_a_LIBADD += @ALLOCA@"
+ echo "libtests_a_DEPENDENCIES += @ALLOCA@"
fi
} > "$tmp"/amsnippet
# Skip the contents if it's entirely empty.