diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/Makefile.in | 11 | ||||
| -rw-r--r-- | gdb/acinclude.m4 | 17 | ||||
| -rw-r--r-- | gdb/aclocal.m4 | 3 |
4 files changed, 29 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b4484d4..d9db2b5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2013-01-17 Pedro Alves <palves@redhat.com> + + * acinclude.m4: Include ../config/plugins.m4, + ../config/largefile.m4 and ../config/lead-dot.m4. Add comments. + * Makefile.in (aclocal_m4_deps): Update. + * aclocal.m4: Renegerate. + 2013-01-16 Doug Evans <dje@google.com> * contrib/cc-with-tweaks.sh: Add references to Fission docs. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index beb5bcb..7305e6d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1313,15 +1313,17 @@ config.status: $(srcdir)/configure configure.tgt configure.host ACLOCAL = aclocal ACLOCAL_AMFLAGS = -I ../config + +# Keep these in sync with the includes in acinclude.m4. aclocal_m4_deps = \ configure.ac \ acx_configure_dir.m4 \ - ../config/extensions.m4 \ - ../config/lead-dot.m4 \ - ../config/proginstall.m4 \ ../bfd/bfd.m4 \ ../config/acinclude.m4 \ + ../config/plugins.m4 \ + ../config/lead-dot.m4 \ ../config/override.m4 \ + ../config/largefile.m4 \ ../config/gettext-sister.m4 \ ../config/lib-ld.m4 \ ../config/lib-prefix.m4 \ @@ -1330,7 +1332,8 @@ aclocal_m4_deps = \ ../config/tcl.m4 \ ../config/depstand.m4 \ ../config/lcmessage.m4 \ - ../config/codeset.m4 + ../config/codeset.m4 \ + ../config/zlib.m4 $(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 5399e40..25caddd 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -1,17 +1,30 @@ dnl written by Rob Savoye <rob@cygnus.com> for Cygnus Support 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. + sinclude(acx_configure_dir.m4) dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. sinclude(../bfd/bfd.m4) -dnl This gets the standard macros +dnl This gets the standard macros. sinclude(../config/acinclude.m4) -dnl This gets autoconf bugfixes +dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE. +sinclude(../config/plugins.m4) + +dnl For ACX_LARGEFILE. +sinclude(../config/largefile.m4) + +dnl For AM_SET_LEADING_DOT. +sinclude(../config/lead-dot.m4) + +dnl This gets autoconf bugfixes. sinclude(../config/override.m4) +dnl For ZW_GNU_GETTEXT_SISTER_DIR. sinclude(../config/gettext-sister.m4) dnl For AC_LIB_HAVE_LINKFLAGS. diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index fdd8d08..7b546b7 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -106,7 +106,4 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../config/largefile.m4]) -m4_include([../config/lead-dot.m4]) -m4_include([../config/plugins.m4]) m4_include([acinclude.m4]) |