Fixes windows build with new MS AD sync Add CLIENT_LIBS for libraries required to...

diff --git a/build/top.mk b/build/top.mk
index 7e6ece6c810c9ccd41e4cfe18745f60216356413..3a7660943f20aa65c30d4397c215086b2fd8a0e1 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -156,6 +156,8 @@ INCLUDEDIR= $(top_srcdir)/include
 LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
 LDAP_LIBDIR= $(top_builddir)/libraries
 
+CLIENT_LIBS = @CLIENT_LIBS@
+
 LUTIL_LIBS = @LUTIL_LIBS@
 LTHREAD_LIBS = @LTHREAD_LIBS@
 

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index dac6fec950bcc559869b926daab8204eacad67ad..364b41072617a0d4f83d602c39eed79e3dcb6566 100644 (file)
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -26,7 +26,7 @@ LDAP_LIBDIR= ../../libraries
 MKVOPTS = -s
 
 XLIBS =  $(LDAP_L)
-XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) $(CLIENT_LIBS)
 
 XSRCS  = ldsversion.c ldmversion.c lddversion.c ldrversion.c ldpversion.c \
        ldwversion.c ldvversion.c ldcversion.c ldeversion.c lduversion.c

diff --git a/configure.in b/configure.in
index 9445ba0edd45670923f6436429f56c3d37bddfee..3a78477c674ee6a9ea6beb1bd289ebdbc5c8f09b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -539,6 +539,8 @@ SLAPD_NDB_INCS=
 LTHREAD_LIBS=
 LUTIL_LIBS=
 
+CLIENT_LIBS=
+
 SLAPD_LIBS=
 
 BUILD_SLAPD=no
@@ -1101,6 +1103,7 @@ if test $have_uuid = no ; then
                ]])],[need_rpcrt=yes],[need_rpcrt=no])
        if test $need_rpcrt = yes; then
                SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4"
+               CLIENT_LIBS="$CLIENT_LIBS -lrpcrt4"
        fi
        LIBS="$save_LIBS"
        AC_MSG_RESULT($need_rpcrt)
@@ -3179,6 +3182,7 @@ dnl overlays
   AC_SUBST(BUILD_VALSORT)
 
 AC_SUBST(LDAP_LIBS)
+AC_SUBST(CLIENT_LIBS)
 AC_SUBST(SLAPD_LIBS)
 AC_SUBST(BDB_LIBS)
 AC_SUBST(SLAPD_NDB_LIBS)