Don't --avoid too many modules.

diff --git a/ChangeLog b/ChangeLog
index c8e0eb8fa1629905a0e668dacf7cd7a3a1cfba7a..b9040b1d583fcd0b3c0926723b793c1d89c3c5cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
        * gettext-0.18.1 released.
 
+2010-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: For libgrep, don't use --avoid of modules with
+       applicability 'all'.
+       Reported by Ryan Schmidt <ryandesign@macports.org>.
+
 2010-06-03  Bruno Haible  <bruno@clisp.org>
 
        * README: Remove lots of old cruft. Mention the translators as the

diff --git a/autogen.sh b/autogen.sh
index 0c333a9bb7ca5889f95a674aa59eb5ece801548d..85bdbea3da8d5889eab1022041a5e7fcd2abc62e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -259,7 +259,7 @@ if ! $skip_gnulib; then
       regex
     '
     $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --makefile-name=Makefile.gnulib --local-dir=gnulib-local --local-symlink \
-      --import `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_LIBGREP
+      --import `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then echo --avoid=$m; fi; done` $GNULIB_MODULES_TOOLS_FOR_LIBGREP
     # 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~