X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdbserver%2Facinclude.m4;h=32d5d14ca6eeee14668b7025a6c5092184397e5c;hb=f9a8785566fcd9b36f8e504346f70bc3d5b6cf82;hp=f02a63cc70c33f0c19538d24255e76e1dd1435d3;hpb=006811bc02fe28060a8557b1f17a129440c975d4;p=binutils-gdb.git

diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4
index f02a63cc70c..32d5d14ca6e 100644
--- a/gdbserver/acinclude.m4
+++ b/gdbserver/acinclude.m4
@@ -1,23 +1,18 @@
+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)
 
+# This get AM_GDB_COMPILER_TYPE.
+m4_include(../gdbsupport/compiler-type.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,26 +29,23 @@ 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.
 
-AC_DEFUN([GDBSERVER_HAVE_THREAD_DB_TYPE],
-[AC_MSG_CHECKING([for $1 in thread_db.h])
- AC_CACHE_VAL(gdbserver_cv_have_thread_db_type_$1,
-   [AC_TRY_COMPILE([
-#include <thread_db.h>],
-      [$1 avar],
-      gdbserver_cv_have_thread_db_type_$1=yes,
-      gdbserver_cv_have_thread_db_type_$1=no
-   )])
- if test $gdbserver_cv_have_thread_db_type_$1 = yes; then
-   AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z]), 1,
-	     [Define if <thread_db.h> has $1.])
- fi
- AC_MSG_RESULT($gdbserver_cv_have_thread_db_type_$1)
-])
+AC_DEFUN(
+  [GDBSERVER_HAVE_THREAD_DB_TYPE],
+  [AC_MSG_CHECKING([for $1 in thread_db.h])
+   AC_CACHE_VAL(
+     [gdbserver_cv_have_thread_db_type_$1],
+     [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#include <thread_db.h>], [$1 avar])],
+	[gdbserver_cv_have_thread_db_type_$1=yes],
+	[gdbserver_cv_have_thread_db_type_$1=no]
+      )]
+   )
+   if test $gdbserver_cv_have_thread_db_type_$1 = yes; then
+     AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z]), 1,
+	       [Define if <thread_db.h> has $1.])
+   fi
+   AC_MSG_RESULT($gdbserver_cv_have_thread_db_type_$1)]
+)