Move many configure checks to common.m4

[deliverable/binutils-gdb.git] / gdb / gdbserver / acinclude.m4

diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4
index 78af4b9878f3801ff838cd1b2fb8e7beb8d2ad5d..eba3a131315f39ed14a88d811ee54f0b22b0c1ed 100644 (file)
--- a/gdb/gdbserver/acinclude.m4
+++ b/gdb/gdbserver/acinclude.m4
@@ -1,43 +1,58 @@
 dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE.
-sinclude(../../bfd/bfd.m4)
-
-AC_DEFUN([SRV_CHECK_THREAD_DB],
-[AC_CACHE_CHECK([for libthread_db],[srv_cv_thread_db],
- [old_LIBS="$LIBS"
-  LIBS="$LIBS -lthread_db"
-  AC_TRY_LINK(
-  [void ps_pglobal_lookup() {}
-   void ps_pdread() {}
-   void ps_pdwrite() {}
-   void ps_lgetregs() {}
-   void ps_lsetregs() {}
-   void ps_lgetfpregs() {}
-   void ps_lsetfpregs() {}
-   void ps_get_thread_area() {}
-   void ps_getpid() {}],
-  [td_ta_new();],
-  [srv_cv_thread_db="-lthread_db"],
-  [srv_cv_thread_db=no
-
- if test "$prefix" = "/usr" || test "$prefix" = "NONE"; then
-  thread_db="/lib/libthread_db.so.1"
- else
-  thread_db='$prefix/lib/libthread_db.so.1'
+m4_include(../../bfd/bfd.m4)
+
+m4_include(../acx_configure_dir.m4)
+
+# This gets AM_GDB_WARNINGS.
+m4_include(../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)
+m4_include(../../gdbsupport/common.m4)
+
+dnl For libiberty_INIT.
+m4_include(../libiberty.m4)
+
+dnl For GDB_AC_PTRACE.
+m4_include(../ptrace.m4)
+
+m4_include(../ax_cxx_compile_stdcxx.m4)
+
+dnl For GDB_AC_SELFTEST.
+m4_include(../selftest.m4)
+
+m4_include([../../config/ax_pthread.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
- LIBS="$old_LIBS `eval echo "$thread_db"`"
- AC_TRY_LINK(
-  [void ps_pglobal_lookup() {}
-   void ps_pdread() {}
-   void ps_pdwrite() {}
-   void ps_lgetregs() {}
-   void ps_lsetregs() {}
-   void ps_lgetfpregs() {}
-   void ps_lsetfpregs() {}
-   void ps_get_thread_area() {}
-   void ps_getpid() {}],
-  [td_ta_new();],
-  [srv_cv_thread_db="$thread_db"],
-  [srv_cv_thread_db=no])
-  ]])
- LIBS="$old_LIBS"
-)])
+ AC_MSG_RESULT($gdbserver_cv_have_thread_db_type_$1)
+])