From 6b42a33152dbd3243185e0f17af3d8b44f9bf0d8 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 26 Nov 2002 20:18:03 +0000
Subject: [PATCH] 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             | 5 +++--
 libraries/liblber/Makefile.in     | 2 +-
 libraries/liblunicode/Makefile.in | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index f07cb00fde..28ab9116e2 100644
--- a/libraries/Makefile.in
+++ b/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
 
diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index cae30fbc54..557a8191eb 100644
--- a/libraries/liblber/Makefile.in
+++ b/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
 
diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index ef2e3614a0..e56befe87c 100644
--- a/libraries/liblunicode/Makefile.in
+++ b/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       
-- 
2.39.5