diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-12 11:03:22 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-12 11:03:42 +0100 |
| commit | a7639b7b5a77a458433d113f1c4b076d4469536e (patch) | |
| tree | 9ea367c056db2f746631087ab939432448fd2249 | |
| parent | 1b1f0bbb28c6146f3aa12ef3f87f2eb1aa0c7479 (diff) | |
Enable pgsql LDAP support when building with OpenLDAP
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 5 | ||||
| -rw-r--r-- | postgresql/makefile.mk | 3 | ||||
| -rw-r--r-- | postgresql/prj/build.lst | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 68837d9564b7..4784d75f4fa4 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 898471bbfb13..0628d71a6566 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 756db8a1bfd1..5059f9521b22 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 |