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.

diff --git a/libtextstyle/autogen.sh b/libtextstyle/autogen.sh
index 0a66f579762ab0970dc457c1646242c4d00128f3..8b09effa2da4f3bee56a6986598fabf0cdddef5e 100755 (executable)
--- 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 13c79fee82cf2a78463cbf935c57626d4dfb6593..63b4c2a1e5aa6c68ffaa329d710cacaf2e33cb63 100644 (file)
--- 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 <unistd.h> does not declare isatty(). The
 dnl adhoc-tests want to get this declaration from <textstyle.h>, not <unistd.h>.