diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-12 15:58:19 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-12 15:58:44 +0100 |
| commit | 80d3c4b682c1d589047acc2d4f5c7ae8c90cc013 (patch) | |
| tree | ef9f50e795d5437008046cd5a112b5c3c38ba646 | |
| parent | fb37327df4153a31d7ba28e2bc3f742f4efc9f34 (diff) | |
Hopefully the last of the pgsql saga
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 4784d75f4fa4..160e305118a1 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 |