Bruce Korb <bruce.k...@gmail.com> writes:
> The problem is related (somehow) to gnulib-comp.m4.
> The original flavor of that file lives in gnulib/m4 and does not contain
> the string GNU_GETTEXT_VERSION, but the installed version does:
>
>> $ find sharutils-bld -type f|xargs fgrep AM_GNU_GETTEXT_VERSION
>> [...]
>> sharutils-bld/m4/gnulib-comp.m4: AM_GNU_GETTEXT_VERSION([0.18.1])
Looking at sharutils/bootstrap, it invokes autopoint before gnulib-tool
--import, and then pulls the 'gettext' module from Gnulib. That means
intl.m4 and po.m4 will be replaced with Gnulib's version.
So I have two questions: why do you need 'gettext' module from Gnulib
and why do you run autopoint before gnulib-tool --import?
I tried the attached patch and it seems to work.
diff --git a/bootstrap b/bootstrap
index 74b8c8f..618f6ca 100755
--- a/bootstrap
+++ b/bootstrap
@@ -259,7 +259,6 @@ run_gnulib_tool() {
getcwd
gethostname
getopt-gnu
- gettext
idcache
inttostr
malloc-gnu
@@ -285,20 +284,15 @@ run_gnulib_tool() {
xstrtoimax
"
- autopoint=$(command -v autopoint)
- ${autopoint} --version | head -n2 >&2
- ${autopoint} --force > /dev/null 2>&1 || :
echo ${gltool} --import ... >&2
{
${gltool} --import ${gnulib_libs} 2>&1
} | sed '1,/^You may need to add #include/d' | \
tee import-log.txt
- for f in intl po
- do
- cp /usr/local/share/aclocal/${f}.m4 m4/.
- touch -r /usr/local/share/aclocal/${f}.m4 m4/${f}.m4
- done
+ autopoint=$(command -v autopoint)
+ ${autopoint} --version | head -n2 >&2
+ ${autopoint} --force > /dev/null 2>&1 || :
}
setup_configure() {
Regards,
--
Daiki Ueno
