Avoid the hash-tests module.

diff --git a/ChangeLog b/ChangeLog
index a6e0b3879c7fbd756ca28b7612afd8839feaf9bb..64b581ef8025320cb0ebdbc9cc495ebef52b585e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-10  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Avoid the 'hash-tests' module. It corresponds to an
+       incompatible 'hash' module.
+
 2009-08-04  Bruno Haible  <bruno@clisp.org>
 
        Port msgfilter to Woe32 platforms.

diff --git a/autogen.sh b/autogen.sh
index 98a2803501a2cb1e022c672e38a481cb5ca4c049..7ba0a4cadf3a74580cda2a48cba97f037fc22adb 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -211,7 +211,7 @@ if ! $skip_gnulib; then
       stdint
     '
     $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 $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_OTHER
+      --import --avoid=hash-tests $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_OTHER
     # In gettext-tools/libgettextpo:
     if test -f gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4; then
       mv -f gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4~

diff --git a/gettext-tools/gnulib-tests/.gitignore b/gettext-tools/gnulib-tests/.gitignore
index d78e0bfb302689164beadd3228fef395704aadd4..f6e964a5ab277c6768380ce1eb8cfece536e7a07 100644 (file)
--- a/gettext-tools/gnulib-tests/.gitignore
+++ b/gettext-tools/gnulib-tests/.gitignore
@@ -55,7 +55,6 @@
 /test-getdtablesize.c
 /test-getline.c
 /test-gettimeofday.c
-/test-hash.c
 /test-iconv.c
 /test-linkedhash_list.c
 /test-locale.c