diff --git a/ChangeLog b/ChangeLog
index 5f8c8671b8..d97e9be01f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* resolv/Depend: New file.
+	* resolv/Makefile (extra-libs, tests): Build libanl and ga_test only
+	when libpthread is built.
+
 2001-03-06  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Add some deltas.
diff --git a/resolv/Depend b/resolv/Depend
new file mode 100644
index 0000000000..fe673ba5ec
--- /dev/null
+++ b/resolv/Depend
@@ -0,0 +1 @@
+linuxthreads
diff --git a/resolv/Makefile b/resolv/Makefile
index fd056d0718..46ca2e07d1 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -35,7 +35,10 @@ tests = tst-aton
 
 include ../Makeconfig
 
-extra-libs := libresolv libanl libnss_dns
+extra-libs := libresolv libnss_dns
+ifeq ($(have-thread-library),yes)
+extra-libs += libanl
+endif
 extra-libs-others = $(extra-libs)
 libresolv-routines := gethnamaddr res_comp res_debug	\
 		      res_data res_mkquery res_query res_send		\
@@ -54,7 +57,7 @@ ifneq ($(build-static-nss),yes)
 libnss_dns-inhibit-o	= $(filter-out .os,$(object-suffixes))
 endif
 
-ifeq (yes,$(build-shared))
+ifeq (yesyes,$(build-shared)$(have-thread-library))
 tests: $(objpfx)ga_test
 endif