connectivity/source/drivers/postgresql/makefile.mk | 5 +++--
postgresql/makefile.mk | 3 +++
postgresql/prj/build.lst | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit a7639b7b5a77a458433d113f1c4b076d4469536e
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Dec 12 11:03:22 2011 +0100
Enable pgsql LDAP support when building with OpenLDAP
diff --git a/connectivity/source/drivers/postgresql/makefile.mk
b/connectivity/source/drivers/postgresql/makefile.mk
index 68837d9..4784d75 100644
--- 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
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 898471b..0628d71 100644
--- 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
diff --git a/postgresql/prj/build.lst b/postgresql/prj/build.lst
index 756db8a..5059f95 100644
--- 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
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
