Fixing build with internal openldap

Change-Id: I365c5252a48b6ba4e8409534c75d34c4d07b2475

extensions/Library_ldapbe2.mk

@@ -61,6 +61,13 @@ else # 0S!=WNT
 $(eval $(call gb_Library_add_libs,ldapbe2,\
 	-lldap \
 	-llber \
+	-lssl3 \
+	-lsmime3 \
+	-lnss3 \
+	-lnssutil3 \
+	-lplds4 \
+	-lplc4 \
+	-lnspr4 \
 ))
 endif
 

openldap/makefile.mk

@@ -36,7 +36,7 @@ PATCH_FILES=\
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-slapd --with-pic --with-tls=moznss --disable-shared --enable-static
+CONFIGURE_FLAGS=--disable-slapd --with-pic --with-tls=moznss --without-cyrus-sasl --disable-shared --enable-static
 .IF "$(SYSTEM_NSS)" == "YES"
 CONFIGURE_FLAGS+=CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)"
 .ELSE

postgresql/makefile.mk

@@ -61,7 +61,13 @@ BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 USE_MICROSOFT_LDAP=1
 CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
-CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --without-readline --disable-shared --with-openssl --with-ldap
+CONFIGURE_ACTION = ./configure --without-readline --disable-shared --with-openssl --with-ldap
+
+.IF "$(OS)" != "WNT" && "$(SYSTEM_OPENLDAP) != "YES"
+CONFIGURE_ACTION += CPPFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/openldap"
+CONFIGURE_ACTION += LDFLAGS="$(SOLARLIB)"
+CONFIGURE_ACTION += EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
+.ENDIF 
 
 .IF "$(CROSS_COMPILING)" == "YES"
 CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)