[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeMacOSX.conf postgresql/makefile.mk

[Fridrich Strba]

 distro-configs/LibreOfficeMacOSX.conf |    2 ++
 postgresql/makefile.mk                |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 49eccc1c659708761082dcca8860620e2e3b3b44
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Dec 11 12:24:38 2011 +0100

    Make internal pgsql build on mac and make it default for release
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 3d22aa9..59ea95b 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -10,4 +10,6 @@
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript
 --enable-ext-nlpsolver
+--enable-ext-postgresql-sdbc
 --enable-extension-integration
+--without-system-postgresql
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 2aae5db..2979779 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -63,7 +63,7 @@ BUILD_DIR=src/interfaces/libpq
 # --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
-BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM)
+BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF
 
 # --- Targets ------------------------------------------------------