diff options
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 00e75e3..240754b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -73,6 +73,7 @@ system-quote unistd unlocked-io update-copyright +vararrays verify version-etc version-etc-fsf @@ -106,18 +107,36 @@ grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null && grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null && gettext_external=1 +needed_gnulib_files= +unnecessary_gettext_files= + if test $gettext_external = 1; then # Gettext supplies these files, but we don't need them since # we don't have an intl subdirectory. - excluded_files=' - m4/glibc2.m4 - m4/intdiv0.m4 - m4/lcmessage.m4 - m4/printf-posix.m4 - m4/uintmax_t.m4 - m4/ulonglong.m4 - m4/visibility.m4 -' + unnecessary_gettext_files=' + m4/glibc2.m4 + m4/intdiv0.m4 + m4/intl.m4 + m4/intldir.m4 + m4/intmax.m4 + m4/lcmessage.m4 + m4/lock.m4 + m4/printf-posix.m4 + m4/threadlib.m4 + m4/uintmax_t.m4 + m4/visibility.m4 + ' + + # Gettext supplies these files, but the gnulib version of these files + # typically is more up-to-date. We don't use gnulib's gettext module, + # as it's too heavyweight, so grab the files one at a time instead. + needed_gnulib_files=' + m4/gettext.m4 + m4/intlmacosx.m4 + m4/nls.m4 + m4/po.m4 + m4/progtest.m4 + ' fi gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests @@ -130,7 +149,7 @@ gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests # Build prerequisites buildreq="\ autoconf 2.61 -automake 1.11 +automake 1.12.2 autopoint - gettext - git 1.4.4 @@ -145,6 +164,15 @@ tar - # Automake requires that ChangeLog exist. touch ChangeLog || exit 1 +bootstrap_post_import_hook() +{ + for file in $needed_gnulib_files; do + echo "$0: $gnulib_tool --copy-file $file $file ..." + $gnulib_tool --copy-file $file $file || exit + done + rm -f $unnecessary_gettext_files || exit +} + bootstrap_epilogue() { perl -pi -e "s/\@PACKAGE\@/$package/g" README-release |