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.

diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index 0237faac888ce2a05f9e42ad9c0af7ab50fa7b06..25bbcbca038256960fa405d34e19f0e0b4941676 100644 (file)
--- a/libraries/Makefile.in
+++ b/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
 

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index 044805a25bff7fdfad70c8ffbaebdbf135564cf0..f27e9eeef277d298115056efa838ff2150dc13ae 100644 (file)
--- a/libraries/libldap_r/Makefile.in
+++ b/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 \