From ae436983cbae0afe4c8c07f9d65f89e6d446827a Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sun, 22 Sep 2013 08:32:25 +0700 Subject: 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 --- bootstrap.conf | 14 ++++++++++++++ configure.ac | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1