[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source

[Fridrich Strba]

 connectivity/source/drivers/postgresql/makefile.mk |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 819e7e237f69e426c7438f3766519837148e63aa
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 12 15:58:19 2011 +0100

    Hopefully the last of the pgsql saga

diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 4784d75..160e305 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -77,9 +77,16 @@ PQ_SDBC_MINOR=8
 PQ_SDBC_MICRO=2
 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO)
 
+LIBPQ_DEP_LIBS=
 .IF "$(SYSTEM_POSTGRESQL)"=="YES"
 LIBPQ_LINK=-lpq
 .ELSE #SYSTEM_POSTGRESQL==NO
+LIBPQ_DEP_LIBS += \
+        $(OPENSSLLIB)
+.IF "$(WITH_LDAP)" == "YES"
+LIBPQ_DEP_LIBS+=\
+        $(LDAPSDKLIB)
+.ENDIF
 .IF "$(GUI)$(COM)"=="WNTMSC"
 LIBPQ_LINK=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib
 .ELSE
@@ -153,8 +160,7 @@ SHL2STDLIBS= \
         $(SALHELPERLIB)		\
         $(POSTGRESQL_LIB)	\
         $(LIBPQ_LINK)	\
-        $(OPENSSLLIB)	\
-        $(LDAPSDKLIB)
+        $(LIBPQ_DEP_LIBS)
 
 SHL2LIBS=	$(LIB2TARGET)
 SHL2DEF=	$(MISC)$/$(SHL2TARGET).def