Reorder build order to ensure -llutil is available -llber and

-llber is available for -llunicode.  Add -llber to ucgendat
(to pick up snprintf).

libraries/Makefile.in

@@ -4,7 +4,8 @@
 ##
 ## Libraries Makefile for OpenLDAP
 
-SUBDIRS= liblutil liblunicode libldif \
-	liblber libldap libldap_r \
+SUBDIRS= liblutil liblber \
+	liblunicode libldif \
+	libldap libldap_r \
 	libavl libldbm librewrite
 

libraries/liblber/Makefile.in

@@ -17,7 +17,7 @@ LIB_DEFS = -DLBER_LIBRARY
 
 SRCS= assert.c decode.c encode.c io.c bprint.c debug.c \
 	memory.c options.c sockbuf.c $(@PLAT@_SRCS)
-OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo debug.lo\
+OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo debug.lo \
 	memory.lo options.lo sockbuf.lo $(@PLAT@_OBJS)
 XSRCS= version.c
 

libraries/liblunicode/Makefile.in

@@ -14,7 +14,7 @@ SRCS	= ucstr.c
 OBJS	= ucdata.o ure.o urestubs.o ucstr.o
 
 XLIB = $(LIBRARY)
-XLIBS = $(LDAP_LIBLUTIL_A)
+XLIBS = $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 PROGRAMS = ucgendat
 
 LDAP_INCDIR= ../../include