[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source postgresql/makefile.mk postgresql/prj
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 d8583566f20389ddfbe662615f27671178e6fd0e Author: Fridrich Å trba Date: Mon Dec 12 11:03:22 2011 +0100 Enable pgsql LDAP support when building with OpenLDAP Signed-off-by: Fridrich Å trba 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 postgresqlnmake - all my_mkout NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source postgresql/makefile.mk
connectivity/source/drivers/postgresql/makefile.mk |1 + postgresql/makefile.mk |9 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) New commits: commit 9b7a7ba72880fe90a0139ddca4bfc9ad180a6d4d Author: Fridrich Å trba Date: Mon Dec 12 10:16:32 2011 +0100 Enable OpenSSL support in the internal libpq Signed-off-by: Fridrich Å trba diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 29f2029..68837d9 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -151,6 +151,7 @@ SHL2STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) \ $(SALHELPERLIB)\ + $(OPENSSLLIB) \ $(POSTGRESQL_LIB) \ $(LIBPQ_LINK) diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 2979779..898471b 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -52,17 +52,12 @@ CONFIGURE_DIR=. BUILD_DIR=src CONFIGURE_ACTION = -BUILD_ACTION = nmake -f win32.mak +BUILD_ACTION = nmake -f win32.mak USE_SSL=1 .ELSE CONFIGURE_DIR=. BUILD_DIR=src/interfaces/libpq -# TODO: -# --datarootdir changes where libpq expects internationalisation of its messages -# (which we don't install anyway for now...) -# --sysconfdir: config files. Ideally, we would like that to be "the same as the platform default", -# but that's quite some guessing work. -CONFIGURE_ACTION = ./configure --without-readline --disable-shared +CONFIGURE_ACTION = ./configure --without-readline --disable-shared --with-openssl BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
