Modify build order to have lutil first and lthread last (libldap_r

will eventually be very last).  Add lthread/lutil to libldap_r test
program linkage.

libraries/Makefile.in

@@ -3,6 +3,6 @@
 ##
 ## Libraries Makefile for OpenLDAP
 
-SUBDIRS= libavl liblber libldap libldif libldbm liblthread \
-	liblutil # libldap_r
+SUBDIRS= liblutil libavl libldif liblber libldap libldbm \
+	liblthread # libldap_r
 

libraries/libldap_r/Makefile.in

@@ -27,8 +27,9 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
-XLIBS = -lldap_r -llber
-XXLIBS = 
+XLIBS = -lldap_r -llber -llthread -llutil
+XXLIBS = $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
 
 .links : FORCE
 	@for i in $(XXSRCS); do \