Use m4_include, not sinclude in .m4 files

Pedro pointed out that sinclude does not error if a file is missing.
This patch changes gdb to only use m4_include, which seems more
correct.

gdb/ChangeLog
2019-09-30  Tom Tromey  <tom@tromey.com>

	* configure: Rebuild.
	* acinclude.m4: Use m4_include, not sinclude.

gdb/gdbserver/ChangeLog
2019-09-30  Tom Tromey  <tom@tromey.com>

	* configure: Rebuild.
	* acinclude.m4: Use m4_include, not sinclude.

gdb/testsuite/ChangeLog
2019-09-30  Tom Tromey  <tom@tromey.com>

	* configure: Rebuild.
	* aclocal.m4: Use m4_include, not sinclude.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1be7f4b2f6ec77ca32cddf8ec8bfaf928dd6fb03..17a8b9875c30d122d96732a398f33034b00f7ca8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-30  Tom Tromey  <tom@tromey.com>
+
+       * configure: Rebuild.
+       * acinclude.m4: Use m4_include, not sinclude.
+
 2019-09-30  Ali Tamur <tamur@google.com>
 
        * dwarf2read.c (skip_one_die): Handle DW_FORM_strx forms.

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 6e81aaed3bf442348b3b18f229d7cf01d62b2722..5f1358b82071a3aa4aca32e8b34aa75535dafcbc 100644 (file)
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -4,64 +4,64 @@ 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)
+m4_include(acx_configure_dir.m4)
 
 # This gets GDB_AC_TRANSFORM.
-sinclude(transform.m4)
+m4_include(transform.m4)
 
 # This gets AM_GDB_WARNINGS.
-sinclude(warning.m4)
+m4_include(warning.m4)
 
 # AM_GDB_UBSAN
-sinclude(sanitize.m4)
+m4_include(sanitize.m4)
 
 # This gets GDB_AC_SELFTEST.
-sinclude(selftest.m4)
+m4_include(selftest.m4)
 
 dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition.
-sinclude(../bfd/bfd.m4)
+m4_include(../bfd/bfd.m4)
 
 dnl This gets the standard macros.
-sinclude(../config/acinclude.m4)
+m4_include(../config/acinclude.m4)
 
 dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE.
-sinclude(../config/plugins.m4)
+m4_include(../config/plugins.m4)
 
 dnl For ACX_LARGEFILE.
-sinclude(../config/largefile.m4)
+m4_include(../config/largefile.m4)
 
 dnl For AM_SET_LEADING_DOT.
-sinclude(../config/lead-dot.m4)
+m4_include(../config/lead-dot.m4)
 
 dnl This gets autoconf bugfixes.
-sinclude(../config/override.m4)
+m4_include(../config/override.m4)
 
 dnl For ZW_GNU_GETTEXT_SISTER_DIR.
-sinclude(../config/gettext-sister.m4)
+m4_include(../config/gettext-sister.m4)
 
 dnl For AC_LIB_HAVE_LINKFLAGS.
-sinclude(../config/lib-ld.m4)
-sinclude(../config/lib-prefix.m4)
-sinclude(../config/lib-link.m4)
+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.
-sinclude(../config/acx.m4)
+m4_include(../config/acx.m4)
 
 dnl for TCL definitions
-sinclude(../config/tcl.m4)
+m4_include(../config/tcl.m4)
 
 dnl For dependency tracking macros.
-sinclude([../config/depstand.m4])
+m4_include([../config/depstand.m4])
 
 dnl For AM_LC_MESSAGES
-sinclude([../config/lcmessage.m4])
+m4_include([../config/lcmessage.m4])
 
 dnl For AM_LANGINFO_CODESET.
-sinclude([../config/codeset.m4])
+m4_include([../config/codeset.m4])
 
-sinclude([../config/iconv.m4])
+m4_include([../config/iconv.m4])
 
-sinclude([../config/zlib.m4])
+m4_include([../config/zlib.m4])
 
 m4_include([gdbsupport/common.m4])
 

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index c0c6f51a0695b9891f8c275e7f2f3792d47d6a9d..eae3b0b90d8ab5157892c0f3db7149747741b6ca 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-30  Tom Tromey  <tom@tromey.com>
+
+       * configure: Rebuild.
+       * acinclude.m4: Use m4_include, not sinclude.
+
 2019-09-20  Christian Biesinger  <cbiesinger@google.com>
 
        * debug.c (debug_threads): Remove comment in favor of the header.

diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4
index 3887b165c66cc382e2da59691532059e4d62aa29..880c03ac1dbf192de132433c3569fc0c95722bf1 100644 (file)
--- a/gdb/gdbserver/acinclude.m4
+++ b/gdb/gdbserver/acinclude.m4
@@ -1,16 +1,16 @@
 dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE.
-sinclude(../../bfd/bfd.m4)
+m4_include(../../bfd/bfd.m4)
 
-sinclude(../acx_configure_dir.m4)
+m4_include(../acx_configure_dir.m4)
 
 # This gets AM_GDB_WARNINGS.
-sinclude(../warning.m4)
+m4_include(../warning.m4)
 
 dnl This gets autoconf bugfixes
-sinclude(../../config/override.m4)
+m4_include(../../config/override.m4)
 
 dnl For ACX_PKGVERSION and ACX_BUGURL.
-sinclude(../../config/acx.m4)
+m4_include(../../config/acx.m4)
 
 m4_include(../../config/depstand.m4)
 m4_include(../../config/lead-dot.m4)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8420c39adecaa3862c43cdf4baa94106f3a17357..127460a26bc8b5889ec211e51680591433547a25 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-30  Tom Tromey  <tom@tromey.com>
+
+       * configure: Rebuild.
+       * aclocal.m4: Use m4_include, not sinclude.
+
 2019-09-30  Tom Tromey  <tromey@adacore.com>
 
        * gdb.rust/traits.rs: Disable all warnings.

diff --git a/gdb/testsuite/aclocal.m4 b/gdb/testsuite/aclocal.m4
index d40c3a9fc6a3271f737d29aad3940298a933ca02..5061eef53724a2a9303e198b284c40fb74bd38d2 100644 (file)
--- a/gdb/testsuite/aclocal.m4
+++ b/gdb/testsuite/aclocal.m4
@@ -1,6 +1,6 @@
-sinclude(../../config/acx.m4)
-sinclude(../../config/override.m4)
-sinclude(../transform.m4)
+m4_include(../../config/acx.m4)
+m4_include(../../config/override.m4)
+m4_include(../transform.m4)
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-