connectivity/source/drivers/postgresql/makefile.mk | 1 +
postgresql/makefile.mk | 9 ++-------
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit f5501498eb4dae84146b8ad7372656bfe4b6ea35
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Dec 12 10:16:32 2011 +0100
Enable OpenSSL support in the internal libpq
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
