summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-06-08 13:28:33 +0200
committerBruno Haible <bruno@clisp.org>2011-06-08 13:28:33 +0200
commit8604a93b5efc963bd26fd648b3b9367987e075bb (patch)
treedd68d1740b3a23b940089a35fb70c45dc766d9b4
parent735f0aa8ac2b5dc94c5d43396ff8ecc09c195c38 (diff)
downloadgettext-8604a93b5efc963bd26fd648b3b9367987e075bb.tar.gz
Fix a link error due to rpl_wcrtomb on Solaris 9.
-rw-r--r--ChangeLog6
-rwxr-xr-xautogen.sh2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ca361cb5..53fab538e 100644
--- 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 ce74e6bd1..92aa49967 100755
--- 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.