This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=edc10b4b9e2632340ad131ad48bef31c2254a5b1 commit edc10b4b9e2632340ad131ad48bef31c2254a5b1 (HEAD -> master) Author: Guillem Jover <[email protected]> AuthorDate: Sat Jun 27 10:32:38 2020 +0200 build: Do not fail if po4a is not found, and search for it just once A missing po4a should not be fatal, as it was before. And we should not override the initial feature check with the standard check, which was left over by mistake when the new check was introduced. Fixes: commit a74a91310260efe55cc986506fe208ae2776a45a --- debian/changelog | 1 + m4/dpkg-progs.m4 | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed9ca7fcb..00eba01fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dpkg (1.20.2) UNRELEASED; urgency=medium * Build system: - Set SHELL in the test environment. + - Do not fail if po4a is not found, and search for it just once. -- Guillem Jover <[email protected]> Sat, 27 Jun 2020 03:10:36 +0200 diff --git a/m4/dpkg-progs.m4 b/m4/dpkg-progs.m4 index 52f680d85..ad8a611cb 100644 --- a/m4/dpkg-progs.m4 +++ b/m4/dpkg-progs.m4 @@ -51,13 +51,12 @@ AC_DEFUN([DPKG_PROG_PO4A], [ ac_cv_path_PO4A=$ac_path_PO4A ac_path_PO4A_found=: ]) ], [ - AC_MSG_ERROR([cannot find po4a >= _PO4A_MIN_VERSION]) + ac_cv_path_PO4A=no ]) ]) AC_SUBST([PO4A], [$ac_cv_path_PO4A]) - AC_CHECK_PROGS([PO4A], [po4a]) - AS_IF([test "$USE_NLS" = "yes" && test -n "$PO4A"], [ + AS_IF([test "$USE_NLS" = "yes" && test "$ac_cv_path_PO4A" != "no"], [ USE_PO4A=yes ], [ USE_PO4A=no -- Dpkg.Org's dpkg
