3 files changed, 9 insertions, 2 deletions
diff --git a/gdb/config/sparc/nm-sun4sol2.h b/gdb/config/sparc/nm-sun4sol2.h
index 9fb58e0..c83e44d 100644
--- a/gdb/config/sparc/nm-sun4sol2.h
+++ b/gdb/config/sparc/nm-sun4sol2.h
@@ -29,6 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define PRSVADDR_BROKEN
 
+#ifdef HAVE_THREAD_DB_LIB
+
 #ifdef __STDC__
 struct objfile;
 #endif
@@ -36,3 +38,5 @@ struct objfile;
 #define target_new_objfile(OBJFILE) sol_thread_new_objfile (OBJFILE)
 
 void sol_thread_new_objfile PARAMS ((struct objfile *objfile));
+
+#endif
diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh
index 5390b5b..b24ce9f 100644
--- a/gdb/config/sparc/sun4sol2.mh
+++ b/gdb/config/sparc/sun4sol2.mh
@@ -5,8 +5,7 @@ XDEPFILES= ser-tcp.o
 XM_CLIBS= -lsocket -lnsl
 
 NAT_FILE= nm-sun4sol2.h
-NATDEPFILES= corelow.o core-sol2.o solib.o procfs.o fork-child.o sol-thread.o
-NAT_CLIBS= /lib/libthread_db.so.1
+NATDEPFILES= corelow.o core-sol2.o solib.o procfs.o fork-child.o
 
 # SVR4 comes standard with terminfo, and in some implementations, the
 # old termcap descriptions are incomplete.  So ensure that we use the
diff --git a/gdb/config/sparc/tm-sun4sol2.h b/gdb/config/sparc/tm-sun4sol2.h
index 49afbab..8a2a0e6 100644
--- a/gdb/config/sparc/tm-sun4sol2.h
+++ b/gdb/config/sparc/tm-sun4sol2.h
@@ -76,5 +76,9 @@ extern char *sunpro_static_transform_name PARAMS ((char *));
 #define PIDGET(pid) ((pid) & 0xffff)
 #define TIDGET(pid) (((pid) >> 16) & 0xffff)
 
+#ifdef HAVE_THREAD_DB_LIB
+
 extern char *solaris_pid_to_str PARAMS ((int pid));
 #define target_pid_to_str(PID) solaris_pid_to_str (PID)
+
+#endif