diff options
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/ChangeLog | 7 | ||||
| -rw-r--r-- | gdbserver/acinclude.m4 | 25 | ||||
| -rw-r--r-- | gdbserver/aclocal.m4 | 9 | ||||
| -rwxr-xr-x | gdbserver/configure | 1 | ||||
| -rw-r--r-- | gdbserver/configure.ac | 1 |
5 files changed, 24 insertions, 19 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 9f4fcf8..c2ff85e 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2021-06-19 Mike Frysinger <vapier@gentoo.org> + + * acinclude.m4: Delete most m4_include's of ../config files. + * configure.ac: Delete m4_include call and call AC_CONFIG_MACRO_DIR. + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-14 Mike Frysinger <vapier@gentoo.org> * Makefile.in (GNULIB_BUILDDIR): Rename to ... diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4 index e18ee99..d68e318 100644 --- a/gdbserver/acinclude.m4 +++ b/gdbserver/acinclude.m4 @@ -1,23 +1,15 @@ +dnl NB: When possible, try to avoid explicit includes of ../config/ files. +dnl They're normally found by aclocal automatically and recorded in aclocal.m4. +dnl However, some are kept here explicitly to silence harmless warnings from +dnl aclocal when it finds AM_xxx macros via local search paths instead of +dnl system search paths. + dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE. m4_include(../bfd/bfd.m4) dnl This gets AM_GDB_WARNINGS. m4_include(../gdbsupport/warning.m4) -dnl This gets autoconf bugfixes -m4_include(../config/override.m4) - -dnl For ACX_PKGVERSION and ACX_BUGURL. -m4_include(../config/acx.m4) - -m4_include(../config/depstand.m4) -m4_include(../config/lead-dot.m4) - -dnl Needed for common.m4 -dnl For AC_LIB_HAVE_LINKFLAGS. -m4_include(../config/lib-ld.m4) -m4_include(../config/lib-prefix.m4) -m4_include(../config/lib-link.m4) dnl codeset.m4 is needed for common.m4, but not for dnl anything else in gdbserver. m4_include(../config/codeset.m4) @@ -34,11 +26,6 @@ m4_include(../gdb/ax_cxx_compile_stdcxx.m4) dnl For GDB_AC_SELFTEST. m4_include(../gdbsupport/selftest.m4) -m4_include([../config/ax_pthread.m4]) - -dnl For ZW_GNU_GETTEXT_SISTER_DIR. -m4_include(../config/gettext-sister.m4) - dnl Check for existence of a type $1 in libthread_db.h dnl Based on BFD_HAVE_SYS_PROCFS_TYPE in bfd/bfd.m4. diff --git a/gdbserver/aclocal.m4 b/gdbserver/aclocal.m4 index 110b416..bceb92f 100644 --- a/gdbserver/aclocal.m4 +++ b/gdbserver/aclocal.m4 @@ -199,4 +199,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_include([../config/acx.m4]) +m4_include([../config/ax_pthread.m4]) +m4_include([../config/depstand.m4]) +m4_include([../config/gettext-sister.m4]) +m4_include([../config/lead-dot.m4]) +m4_include([../config/lib-ld.m4]) +m4_include([../config/lib-link.m4]) +m4_include([../config/lib-prefix.m4]) +m4_include([../config/override.m4]) m4_include([acinclude.m4]) diff --git a/gdbserver/configure b/gdbserver/configure index aab72c0..b9d4653 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -2714,6 +2714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers config.h:config.in" diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac index 5ec222d..afac183 100644 --- a/gdbserver/configure.ac +++ b/gdbserver/configure.ac @@ -19,6 +19,7 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>. dnl Process this file with autoconf to produce a configure script. AC_INIT +AC_CONFIG_MACRO_DIRS([../config]) AC_CONFIG_SRCDIR([server.cc]) AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h]) |