From adeab0c5b33fd5f4959fa9a079a5b558f0088ba3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 6 Feb 2021 19:24:29 -0500 Subject: config/debuginfod: do not include pkg.m4 directly Any code using AC_DEBUGINFOD from this dir is using -I../config when running aclocal, so an explicit include on pkg.m4 is unnecessary: aclocal will find the pkg.m4 in this dir just as easily. This is seen in the only two dirs that use AC_DEBUGINFOD (binutils & gdb) as their aclocal.m4 already has m4_include on config m4 files. The include as written only works if aclocal is run on a dir that is at the same level of config/. Any other depth will fail. ./ |-- config/ |-- binutils/ # works |-- gdb/ # works `-- sim/ # works `-- / # fails It fails even if AC_DEBUGINFOD itself isn't used: sim/bfin/ $ aclocal -I../../config aclocal-1.15: error: ../../config/debuginfod.m4:8: file '../config/pkg.m4' does not exist --- gdb/ChangeLog | 4 ++++ gdb/aclocal.m4 | 1 + 2 files changed, 5 insertions(+) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e79b953..204bb40 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * aclocal.m4: Regenerate. + 2021-02-12 Tom de Vries PR threads/26228 diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index 110b416..cbea739 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -199,4 +199,5 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_include([../config/pkg.m4]) m4_include([acinclude.m4]) -- cgit v1.1