create SASL_LIBS to hold -lsasl

create SECURITY_LIBS (top.mk) to order $SASL_LIBS $KRB_LIBS $TLS_LIBS
use $SECURITY_LIBS in Makefile.in's instead of $KRB_LIBS $TLS_LIBS

build/top.mk

@@ -120,7 +120,10 @@ AC_LDFLAGS = @LDFLAGS@
 AC_LIBS = @LIBS@
 
 KRB_LIBS = @KRB_LIBS@
+SASL_LIBS = @SASL_LIBS@
 TLS_LIBS = @TLS_LIBS@
+SECURITY_LIBS = @SASL_LIBS@ @KRB_LIBS@ @TLS_LIBS@
+
 MODULES_CPPFLAGS = @SLAPD_MODULES_CPPFLAGS@
 MODULES_LDFLAGS = @SLAPD_MODULES_LDFLAGS@
 PERL_CPPFLAGS = @SLAPD_PERL_CPPFLAGS@

clients/fax500/Makefile.in

@@ -10,7 +10,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 rp500 : rpversion.o
 	$(LTLINK) -o $@ $(RPOBJS) rpversion.o $(LIBS)

clients/finger/Makefile.in

@@ -7,7 +7,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 in.xfingerd : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

clients/gopher/Makefile.in

@@ -12,7 +12,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 go500 : goversion.o
 	$(LTLINK) -o $@ $(GOOBJS) goversion.o $(LIBS)

clients/mail500/Makefile.in

@@ -8,7 +8,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 mail500 : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

clients/rcpt500/Makefile.in

@@ -8,7 +8,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 rcpt500 : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

clients/tools/Makefile.in

@@ -8,7 +8,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldif -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(TLS_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
 
 XSRCS	= ldsversion.c ldmversion.c lddversion.c ldrversion.c ldpversion.c
 

clients/ud/Makefile.in

@@ -10,7 +10,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldif -lldap -llber -llutil
-XXLIBS	= $(TERMCAP_LIBS) $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(TERMCAP_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 ud : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

configure.in

@@ -372,6 +372,7 @@ SLAPD_PERL_CPPFLAGS=
 
 KRB_LIBS=
 READLINE_LIBS=
+SASL_LIBS=
 TERMCAP_LIBS=
 TLS_LIBS=
 
@@ -1679,7 +1680,7 @@ if test $ol_with_cyrus_sasl != no ; then
 			[have_cyrus_sasl=yes], [have_cyrus_sasl=no])
 
 		if test $have_cyrus_sasl != no ; then
-			LUTIL_LIBS="$LUTIL_LIBS -lsasl"
+			SASL_LIBS="-lsasl"
 			AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
 			ol_link_sasl=yes
 		fi
@@ -2069,6 +2070,7 @@ AC_SUBST(SLAPD_PERL_LDFLAGS)
 
 AC_SUBST(KRB_LIBS)
 AC_SUBST(READLINE_LIBS)
+AC_SUBST(SASL_LIBS)
 AC_SUBST(TERMCAP_LIBS)
 AC_SUBST(TLS_LIBS)
 

contrib/saucer/Makefile.in

@@ -9,7 +9,7 @@ LDAP_LIBDIR= ../../libraries
 READLINE_LIBS = @READLINE_LIBS@
 
 XLIBS =  -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS) $(READLINE_LIBS) $(TERMCAP_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS) $(READLINE_LIBS) $(TERMCAP_LIBS)
 
 MANDIR=$(mandir)/man1
 

contrib/web_ldap/Makefile.in

@@ -7,7 +7,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS =  -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 web_ldap: ${OBJS} $(LDAP_LIBDEPEND)
 	$(LTLINK) -o $@ $(OBJS) $(LIBS)

libraries/libldap/Makefile.in

@@ -31,7 +31,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS = -lldap -llber
-XXLIBS = $(KRB_LIBS) $(TLS_LIBS)
+XXLIBS = $(SECURITY_LIBS) $(TLS_LIBS)
 
 apitest:	$(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
 	$(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)

libraries/libldap_r/Makefile.in

@@ -35,7 +35,7 @@ LDAP_LIBDIR= ../../libraries
 
 XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
 XLIBS = -lldap_r -llber
-XXLIBS = $(LUTIL_LIBS) $(KRB_LIBS) $(TLS_LIBS)
+XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 
 .links :

servers/ldapd/Makefile.in

@@ -23,7 +23,7 @@ BUILD_SRV = @BUILD_LDAPD@
 all-local-srv: 	ldapd
 
 XLIBS= -llber -llutil
-XXLIBS= $(LDAPD_LIBS) $(KRB_LIBS) $(LUTIL_LIBS)
+XXLIBS= $(LDAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 ldapd:	version.o
 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)

servers/slapd/Makefile.in

@@ -30,7 +30,7 @@ XLDFLAGS = $(MODULES_LDFLAGS)
 # $(LTHREAD_LIBS) must be last
 XLIBS = libbackends.a -lavl -lldbm -lldif -lldap_r -llber -llutil
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
-	$(PERL_LDFLAGS) $(KRB_LIBS) $(TLS_LIBS) \
+	$(PERL_LDFLAGS) $(SECURITY_LIBS) \
 	$(LDIF_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 

servers/slapd/tools/Makefile.in

@@ -24,7 +24,7 @@ XLDFLAGS = $(MODULES_LDFLAGS)
 
 XLIBS = -lavl -lldif -lldbm -lldap_r -llber -llutil
 XXLIBS = $(LDAPD_LIBS) $(SLAPD_LIBS) \
-	$(PERL_LDFLAGS) $(LDBM_LIBS) $(KRB_LIBS) $(TLS_LIBS) \
+	$(PERL_LDFLAGS) $(LDBM_LIBS) $(SECURITY_LIBS) \
 	$(LDIF_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 

servers/slurpd/Makefile.in

@@ -24,7 +24,7 @@ all-local-srv: 	slurpd
 
 # $(LTHREAD_LIBS) must be last!
 XLIBS = -lldif -lldap_r -llber -llutil
-XXLIBS = $(SLURPD_LIBS) $(KRB_LIBS) $(TLS_LIBS) \
+XXLIBS = $(SLURPD_LIBS) $(SECURITY_LIBS) \
 	$(LDIF_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 

tests/progs/Makefile.in

@@ -10,7 +10,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 XLIBS    = -lldap -llber
-XXLIBS	= $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXLIBS	= $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 # build-tools: FORCE
 # $(MAKE) $(MFLAGS) load-tools