mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Quanah Gibson-Mount 2019-01-01 17:37:25 +00:00
parent d3b1558dcb
commit fb35befa9a
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/top.mk
View File

@ -156,6 +156,8 @@ INCLUDEDIR= $(top_srcdir)/include
LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR) LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
LDAP_LIBDIR= $(top_builddir)/libraries LDAP_LIBDIR= $(top_builddir)/libraries
CLIENT_LIBS = @CLIENT_LIBS@
LUTIL_LIBS = @LUTIL_LIBS@ LUTIL_LIBS = @LUTIL_LIBS@
LTHREAD_LIBS = @LTHREAD_LIBS@ LTHREAD_LIBS = @LTHREAD_LIBS@

2
clients/tools/Makefile.in
View File

@ -26,7 +26,7 @@ LDAP_LIBDIR= ../../libraries
MKVOPTS = -s MKVOPTS = -s
XLIBS = $(LDAP_L) 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 \ XSRCS = ldsversion.c ldmversion.c lddversion.c ldrversion.c ldpversion.c \
ldwversion.c ldvversion.c ldcversion.c ldeversion.c lduversion.c ldwversion.c ldvversion.c ldcversion.c ldeversion.c lduversion.c

4
configure.in
View File

@ -539,6 +539,8 @@ SLAPD_NDB_INCS=
LTHREAD_LIBS= LTHREAD_LIBS=
LUTIL_LIBS= LUTIL_LIBS=
CLIENT_LIBS=
SLAPD_LIBS= SLAPD_LIBS=
BUILD_SLAPD=no BUILD_SLAPD=no
@ -1101,6 +1103,7 @@ if test $have_uuid = no ; then
]])],[need_rpcrt=yes],[need_rpcrt=no]) ]])],[need_rpcrt=yes],[need_rpcrt=no])
if test $need_rpcrt = yes; then if test $need_rpcrt = yes; then
SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4" SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4"
CLIENT_LIBS="$CLIENT_LIBS -lrpcrt4"
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
AC_MSG_RESULT($need_rpcrt) AC_MSG_RESULT($need_rpcrt)
@ -3179,6 +3182,7 @@ dnl overlays
AC_SUBST(BUILD_VALSORT) AC_SUBST(BUILD_VALSORT)
AC_SUBST(LDAP_LIBS) AC_SUBST(LDAP_LIBS)
AC_SUBST(CLIENT_LIBS)
AC_SUBST(SLAPD_LIBS) AC_SUBST(SLAPD_LIBS)
AC_SUBST(BDB_LIBS) AC_SUBST(BDB_LIBS)
AC_SUBST(SLAPD_NDB_LIBS) AC_SUBST(SLAPD_NDB_LIBS)