From: Bruno Haible <bruno@clisp.org>
Date: Sun, 5 Jul 2020 19:29:30 +0000 (+0200)
Subject: Remove some now unneeded gnulib-tool --avoid options.
X-Git-Tag: v0.21~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4826fa58dc6a3c472df87e45dc89dbbf5ef07312;p=thirdparty%2Fgettext.git

Remove some now unneeded gnulib-tool --avoid options.

* autogen.sh: Remove some --avoid=*-tests options.
* libtextstyle/autogen.sh: Likewise.
---

diff --git a/autogen.sh b/autogen.sh
index 86bcd4155..5678c5ff9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -278,7 +278,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=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 \
+    --import --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 $?
   $GNULIB_TOOL --copy-file m4/libtextstyle.m4 gettext-tools/gnulib-m4/libtextstyle.m4 || exit $?
   # In gettext-tools/libgrep:
diff --git a/libtextstyle/autogen.sh b/libtextstyle/autogen.sh
index e7a7f98e2..8c3dd74c2 100755
--- a/libtextstyle/autogen.sh
+++ b/libtextstyle/autogen.sh
@@ -99,7 +99,7 @@ if test $skip_gnulib = false; then
     --macro-prefix=lts \
     --makefile-name=Makefile.gnulib --libtool \
     --local-dir=gnulib-local --local-dir=../gnulib-local \
-    --import --avoid=hash-tests $GNULIB_MODULES
+    --import $GNULIB_MODULES
   $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess
   $GNULIB_TOOL --copy-file build-aux/config.sub;   chmod a+x build-aux/config.sub
   $GNULIB_TOOL --copy-file build-aux/declared.sh lib/declared.sh; chmod a+x lib/declared.sh