Fix a link error due to rpl_wcrtomb on Solaris 9.

diff --git a/ChangeLog b/ChangeLog
index 1ca361cb51169001b27e1afb5d138c128aa6f5fb..53fab538e86243fbb3bc9f560ecb904eeff01d9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-08  Bruno Haible  <bruno@clisp.org>
+
+       Fix a link error due to rpl_wcrtomb on Solaris 9.
+       * autogen.sh: Pass the option --witness-c-macro to the gnulib-tool
+       invocation for libgrep.
+
 2011-06-05  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh (GNULIB_MODULES_TOOLS_FOR_LIBGREP): Add mbrlen.

diff --git a/autogen.sh b/autogen.sh
index ce74e6bd1397cb09d16f4b6d67feef3db5140170..92aa4996709966ae9be148004d76b44c3fdd7b12 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -254,7 +254,7 @@ if ! $skip_gnulib; then
       mbrlen
       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 \
+    $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP --makefile-name=Makefile.gnulib --local-dir=gnulib-local --local-symlink \
       --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:
     # This is a subset of the GNULIB_MODULES_FOR_SRC.