diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2013-09-22 08:32:25 +0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2013-09-22 08:32:25 +0700 |
| commit | ae436983cbae0afe4c8c07f9d65f89e6d446827a (patch) | |
| tree | 8f638dffba19403e828809fd86faa0202045c094 | |
| parent | ff8ad823dc940958abf4dd20ac656b5aa45ad8d3 (diff) | |
| download | m4-ae436983cbae0afe4c8c07f9d65f89e6d446827a.tar.gz | |
configury: gettext cleanup.
Gettext's autopoint script only omits the intl directory creation
for exactly 'AM_GNU_GETTEXT([external])'; any additional arguments
force that directory to be built again.
* configure.ac (AM_GNU_GETTEXT): move need-format-string-macros
from here...
(AM_GNU_GETTEXT_NEED): ...to here.
* bootstrap.con (m4_precopy_git_version_gen): Since we use
git-version-gen directly in configure.ac, it has to be in place
before calling autopoint, which leaks error messages about the
missing script otherwise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rw-r--r-- | bootstrap.conf | 14 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 9b3034df..4df5c7aa 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -72,6 +72,20 @@ vc_ignore=".gitignore" ## --------------- ## +# m4_precopy_git_version_gen +# -------------------------- +# Autopoint gets confused if git-version-gen is missing. +m4_precopy_git_version_gen () +{ + $debug_cmd + + $require_build_aux + + func_gnulib_tool_copy_file build-aux/git-version-gen $build_aux/git-version-gen +} +func_add_hook func_prep m4_precopy_git_version_gen + + # m4_install_texinfo_diff_driver # ------------------------------ # Help git to do a better job of merging texinfo files. diff --git a/configure.ac b/configure.ac index 05d2c99f..bda7490e 100644 --- a/configure.ac +++ b/configure.ac @@ -207,7 +207,8 @@ AC_SUBST([PREOPEN_DEPENDENCIES]) ## ---------------- ## ## Gettext support. ## ## ---------------- ## -AM_GNU_GETTEXT([external], [need-formatstring-macros]) +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_NEED([need-formatstring-macros]) AM_GNU_GETTEXT_VERSION([0.16]) M4_GNU_GETTEXT |