yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdb/gdbserver: switch to AC_CONFIG_MACRO_DIRS

Browse Source 
These dirs don't use automake, so use AC_CONFIG_MACRO_DIRS to specify
../config as a search dir for m4 macros.  This allows removal of a lot
of hand-written m4_include's from acinclude.m4 files, and simplifies
use of `aclocal` or `autoreconf` as manual -I is not needed.
This commit is contained in:
Mike Frysinger 2021-06-15 01:40:33 -04:00
parent 57a922a598
commit 7e3941ac06
10 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -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-17 Pedro Alves <pedro@palves.net>
* scoped_ignore_signal.h (scoped_ignore_signal): Add

47
gdb/acinclude.m4
View File

@ -4,6 +4,12 @@ dnl major rewriting for Tcl 7.5 by Don Libes <libes@nist.gov>
# Keep these includes in sync with the aclocal_m4_deps list in
# Makefile.in.
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.
m4_include(acx_configure_dir.m4)
# This gets GDB_AC_TRANSFORM.
@ -21,47 +27,16 @@ m4_include(../gdbsupport/selftest.m4)
dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition.
m4_include(../bfd/bfd.m4)
dnl This gets the standard macros.
m4_include(../config/acinclude.m4)
dnl This gets GCC_ENABLE.
sinclude(../config/enable.m4)
dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE.
m4_include(../config/plugins.m4)
dnl For ACX_LARGEFILE.
m4_include(../config/largefile.m4)
dnl For AM_SET_LEADING_DOT.
m4_include(../config/lead-dot.m4)
dnl This gets autoconf bugfixes.
m4_include(../config/override.m4)
dnl For ZW_GNU_GETTEXT_SISTER_DIR.
m4_include(../config/gettext-sister.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 For ACX_PKGVERSION and ACX_BUGURL.
m4_include(../config/acx.m4)
dnl for TCL definitions
m4_include(../config/tcl.m4)
dnl For dependency tracking macros.
m4_include([../config/depstand.m4])
dnl For AM_LC_MESSAGES
m4_include([../config/lcmessage.m4])
dnl For AM_LANGINFO_CODESET.
m4_include([../config/codeset.m4])
dnl We need to explicitly include these before iconv.m4 to avoid warnings.
m4_include([../config/lib-ld.m4])
m4_include([../config/lib-prefix.m4])
m4_include([../config/lib-link.m4])
m4_include([../config/iconv.m4])
m4_include([../config/zlib.m4])
@ -76,8 +51,6 @@ m4_include(../gdbsupport/ptrace.m4)
m4_include(ax_cxx_compile_stdcxx.m4)
m4_include([../config/ax_pthread.m4])
dnl written by Guido Draheim <guidod@gmx.de>, original by Alexandre Oliva
dnl Version 1.3 (2001/03/02)
dnl source http://www.gnu.org/software/ac-archive/Miscellaneous/ac_define_dir.html

11
gdb/aclocal.m4 vendored
View File

@ -199,5 +199,16 @@ 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/debuginfod.m4])
m4_include([../config/depstand.m4])
m4_include([../config/enable.m4])
m4_include([../config/gettext-sister.m4])
m4_include([../config/largefile.m4])
m4_include([../config/lead-dot.m4])
m4_include([../config/override.m4])
m4_include([../config/pkg.m4])
m4_include([../config/plugins.m4])
m4_include([../config/tcl.m4])
m4_include([acinclude.m4])

1
gdb/configure vendored
View File

@ -2997,6 +2997,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h:config.in"

3
gdb/configure.ac
View File

@ -18,9 +18,8 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl Process this file with autoconf to produce a configure script.
m4_include(../config/debuginfod.m4)
AC_INIT
AC_CONFIG_MACRO_DIRS([../config])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h])
AM_MAINTAINER_MODE

7
gdbserver/ChangeLog
View File

@ -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 ...

25
gdbserver/acinclude.m4
View File

@ -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.

9
gdbserver/aclocal.m4 vendored
View File

@ -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])

1
gdbserver/configure vendored
View File

@ -2714,6 +2714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h:config.in"

1
gdbserver/configure.ac
View File

@ -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])