From 0f54591c0e133db380151c331d946f7ebc9b4452 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 11 Apr 2019 00:49:37 +0200 Subject: [PATCH] build: Fix build failure on mingw (regression from 2019-04-02). * libtextstyle/autogen.sh: Pass a --macro-prefix option to gnulib-tool. * libtextstyle/configure.ac: Update accordingly. --- libtextstyle/autogen.sh | 1 + libtextstyle/configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libtextstyle/autogen.sh b/libtextstyle/autogen.sh index 0a66f5797..8b09effa2 100755 --- a/libtextstyle/autogen.sh +++ b/libtextstyle/autogen.sh @@ -91,6 +91,7 @@ if test $skip_gnulib = false; then term-ostream-tests ' $GNULIB_TOOL --lib=libtextstyle --source-base=lib --m4-base=gnulib-m4 --tests-base=tests \ + --macro-prefix=lts \ --makefile-name=Makefile.gnulib --libtool \ --local-dir=gnulib-local --local-dir=../gnulib-local \ --import --avoid=hash-tests $GNULIB_MODULES diff --git a/libtextstyle/configure.ac b/libtextstyle/configure.ac index 13c79fee8..63b4c2a1e 100644 --- a/libtextstyle/configure.ac +++ b/libtextstyle/configure.ac @@ -41,7 +41,7 @@ AC_CANONICAL_HOST dnl Checks that augment the CPPFLAGS. -gl_EARLY +lts_EARLY dnl Checks for compiler output filename suffixes. @@ -68,7 +68,7 @@ AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) dnl Checks for types, header files, functions and declarations. -gl_INIT +lts_INIT dnl Arrange that the gnulib-generated does not declare isatty(). The dnl adhoc-tests want to get this declaration from , not .