From: Bruno Haible <bruno@clisp.org>
Date: Wed, 10 Apr 2019 22:51:44 +0000 (+0200)
Subject: build: Fix build failure on mingw (regression from 2019-04-02).
X-Git-Tag: v0.20~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1502895ae722af0fc62eadab9c54a5fd1bb5275;p=thirdparty%2Fgettext.git

build: Fix build failure on mingw (regression from 2019-04-02).

* gettext-tools/woe32dll/gettextlib-exports.c: Remove
gl_array_list_implementation, styled_ostream_typeinfo.
* gettext-tools/woe32dll/gettextsrc-exports.c: Remove color_mode,
color_test_mode, style_file_name.
* autogen.sh: Don't import the gnulib array-list-tests and linkedhash-list-tests
modules.
---

diff --git a/autogen.sh b/autogen.sh
index 8d98a7b72..dbb93782b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -262,7 +262,7 @@ if ! $skip_gnulib; then
     uniwidth/width-tests
   '
   $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \
-    --import --avoid=hash-tests --avoid=fdutimensat-tests --avoid=futimens-tests --avoid=utime-tests --avoid=utimens-tests --avoid=utimensat-tests \
+    --import --avoid=array-list-tests --avoid=linkedhash-list-tests --avoid=hash-tests --avoid=fdutimensat-tests --avoid=futimens-tests --avoid=utime-tests --avoid=utimens-tests --avoid=utimensat-tests \
     `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER || exit $?
   # In gettext-tools/libgrep:
   GNULIB_MODULES_TOOLS_FOR_LIBGREP='
diff --git a/gettext-tools/woe32dll/gettextlib-exports.c b/gettext-tools/woe32dll/gettextlib-exports.c
index 2469bbbea..292fc2a68 100644
--- a/gettext-tools/woe32dll/gettextlib-exports.c
+++ b/gettext-tools/woe32dll/gettextlib-exports.c
@@ -1,5 +1,5 @@
 /* List of exported symbols of libgettextlib on Cygwin.
-   Copyright (C) 2006-2007, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010, 2012, 2019 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@ VARIABLE(rpl_error_print_progname)
 #endif
 VARIABLE(error_with_progname)
 VARIABLE(exit_failure)
-VARIABLE(gl_array_list_implementation)
 VARIABLE(gl_linkedhash_list_implementation)
 VARIABLE(program_name)
 #if GNULIB_DEFINED_GETOPT
@@ -33,4 +32,3 @@ VARIABLE(rpl_optarg)
 VARIABLE(rpl_optind)
 #endif
 VARIABLE(simple_backup_suffix)
-VARIABLE(styled_ostream_typeinfo)
diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c
index dd718ba53..8de53a7b0 100644
--- a/gettext-tools/woe32dll/gettextsrc-exports.c
+++ b/gettext-tools/woe32dll/gettextsrc-exports.c
@@ -1,5 +1,5 @@
 /* List of exported symbols of libgettextsrc on Cygwin.
-   Copyright (C) 2006-2007, 2009-2011, 2013-2015 Free Software Foundation,
+   Copyright (C) 2006-2007, 2009-2011, 2013-2015, 2019 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
@@ -23,8 +23,6 @@
 #include "woe32dll/export.h"
 
 VARIABLE(allow_duplicates)
-VARIABLE(color_mode)
-VARIABLE(color_test_mode)
 VARIABLE(format_language)
 VARIABLE(format_language_pretty)
 VARIABLE(formatstring_awk)
@@ -86,5 +84,4 @@ VARIABLE(po_multiline_warning)
 VARIABLE(po_xerror)
 VARIABLE(po_xerror2)
 VARIABLE(syntax_check_name)
-VARIABLE(style_file_name)
 VARIABLE(use_first)