Enable pgsql LDAP support when building with OpenLDAP

2011-12-12 11:03:22 +01:00
parent 1b1f0bbb28
commit a7639b7b5a
3 changed files with 7 additions and 3 deletions
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -151,9 +151,10 @@ SHL2STDLIBS= \
        $(CPPUHELPERLIB)	\
        $(SALLIB)		\
        $(SALHELPERLIB)		\
-		$(OPENSSLLIB)	\
        $(POSTGRESQL_LIB)	\
-        $(LIBPQ_LINK)
+        $(LIBPQ_LINK)	\
+        $(OPENSSLLIB)	\
+        $(LDAPSDKLIB)

 SHL2LIBS=	$(LIB2TARGET)
 SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -58,6 +58,9 @@ CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq

 CONFIGURE_ACTION = ./configure --without-readline --disable-shared --with-openssl
+.IF "$(WITH_LDAP)" == "YES" && "$(WITH_OPENLDAP)" == "YES"
+CONFIGURE_ACTION += --with-ldap
+.ENDIF
 BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF

--- a/postgresql/prj/build.lst
+++ b/postgresql/prj/build.lst
@@ -1,3 +1,3 @@
-my	postgresql	:	solenv sal NULL
+my	postgresql	:	solenv sal OPENSSL:openssl MOZ:moz NULL
 my	postgresql    nmake	-	all	my_mkout NULL