From c0f150c716b9673cb7797bbb4ebb23460db0c783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 19 Mar 2021 18:24:01 +0000 Subject: [PATCH] Search for m4 aliases as well. --- ognibuild/resolver/apt.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ognibuild/resolver/apt.py b/ognibuild/resolver/apt.py index a1d33e5..323c5d7 100644 --- a/ognibuild/resolver/apt.py +++ b/ognibuild/resolver/apt.py @@ -489,12 +489,14 @@ def resolve_perl_file_req(apt_mgr, req): def _find_aclocal_fun(macro): # TODO(jelmer): Use the API for codesearch.debian.net instead? defun_prefix = b"AC_DEFUN([%s]," % macro.encode("ascii") + au_alias_prefix = b"AU_ALIAS([%s]," % macro.encode("ascii") + prefixes = [defun_prefix, au_alias_prefix] for entry in os.scandir("/usr/share/aclocal"): if not entry.is_file(): continue with open(entry.path, "rb") as f: for line in f: - if line.startswith(defun_prefix): + if any([line.startswith(prefix) for prefix in prefixes]): return entry.path raise KeyError