From 60c0f61579b5bbbdeb34b784e09c366e6ce87d49 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 1 Nov 2011 15:47:57 +0100 Subject: [PATCH] Revert "fix libraries order to build with --enable-dynamic (ITS#6517)" This reverts commit f8d944cba3b8572bad9bcacf495fce2ba38278ab. Not needed anymore, since libldif was merged into libldap. Additionally the commit broke linking with "--as-needed". --- build/top.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build/top.mk b/build/top.mk index 41e52b4ed5..66ac3bf91d 100644 --- a/build/top.mk +++ b/build/top.mk @@ -170,12 +170,10 @@ LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a LDAP_LIBLUTIL_A = $(LDAP_LIBDIR)/liblutil/liblutil.a -LDAP_L = \ - $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) \ - $(LDAP_LIBLUTIL_A) +LDAP_L = $(LDAP_LIBLUTIL_A) \ + $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \ - $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) \ - $(LDAP_LIBLUTIL_A) + $(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) WRAP_LIBS = @WRAP_LIBS@ # AutoConfig generated -- 2.39.5