make check fails building tststatic after configuring with --enable-static-nss

[Patrick Smith]

After configuring glibc 2.3 with --enable-static-nss and building it,
'make check' failed while trying to build tststatic -- the errors were
undefined references to nss functions.  Attached is a patch that fixes this.

(But now make check fails running tst-shm :-().
--
address@hidden



--- linuxthreads/Makefile.orig  2002-10-10 20:11:11.000000000 -0400
+++ linuxthreads/Makefile       2002-10-10 20:12:50.000000000 -0400
@@ -147,8 +147,8 @@
 endif
 
 ifeq (yes,$(build-static-nss))
-otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
-             $(resolvobjdir)/libresolv.a
+static-nss-libs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
+             $(resolvobjdir)/libresolv.a $(link-libc-static)
 endif
 
 ifeq (no,$(cross-compiling))
--- Makeconfig.orig     2002-10-10 00:04:10.000000000 -0400
+++ Makeconfig  2002-10-10 00:06:01.000000000 -0400
@@ -406,7 +406,8 @@
                                                     $(start-installed-name))\
                           $(+preinit) $(link-extra-libs-static) \
                           $(common-objpfx)libc% $(+postinit),$^) \
-             $(link-extra-libs-static) $(link-libc-static) $(+postctor) 
$(+postinit)
+             $(link-extra-libs-static) $(link-libc-static) \
+              $(static-nss-libs) $(+postctor) $(+postinit)
 endif
 # Command for statically linking bounded-pointer programs with the C library.
 ifndef +link-bounded
@@ -447,12 +448,13 @@
 $(common-objdir):$(subst $(empty) ,:,$(patsubst 
../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%)))
 elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
 else
-nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
-resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
 link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) 
$(common-objpfx)libc.a $(gnulib)
 endif
 endif
 
+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
+
 # Differences in the linkers on the various platforms.
 ifeq ($(elf),yes)
 LDFLAGS-rpath-ORIGIN = -Wl,-rpath,'$$ORIGIN'