[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in connectivity/source

[Fridrich Strba]

 configure.in                                       |    6 +++-
 connectivity/source/drivers/postgresql/makefile.mk |   28 +++++++++------------
 2 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit 58b49d96ad2be04253c3aa7b76144322bb5439ce
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 12 04:51:49 2011 +0100

    Some more postgresql fixes
    
    1. The --enable-extension-integration affects only packaging
    2. OUTDIR_FOR_BUILD is for native build in case of crosscompiling
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/configure.in b/configure.in
index 44bb5e9..39c533d 100644
--- a/configure.in
+++ b/configure.in
@@ -5389,8 +5389,10 @@ dnl ===================================================================
 dnl Check for PostgreSQL stuff
 dnl ===================================================================
 
-if test "x$enable_ext_postgresql_sdbc" = "xyes" -a "x$enable_extension_integration" != "xno"; then
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
+if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
+    if test "x$enable_extension_integration" = "xyes"; then
+      SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
+    fi
 
     AC_MSG_CHECKING([PostgreSQL C interface])
     if test "$with_system_postgresql" = "yes"; then
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 91184d8..29f2029 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -77,6 +77,18 @@ PQ_SDBC_MINOR=8
 PQ_SDBC_MICRO=2
 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO)
 
+.IF "$(SYSTEM_POSTGRESQL)"=="YES"
+LIBPQ_LINK=-lpq
+.ELSE #SYSTEM_POSTGRESQL==NO
+.IF "$(GUI)$(COM)"=="WNTMSC"
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib
+.ELSE
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
+.ENDIF
+POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
+POSTGRESQL_LIB=
+.ENDIF
+
 CFLAGS+=$(POSTGRESQL_INC) \
     -DPQ_SDBC_MAJOR=$(PQ_SDBC_MAJOR) \
     -DPQ_SDBC_MINOR=$(PQ_SDBC_MINOR) \
@@ -97,22 +109,6 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 
-# use the static version on Windows?
-# LEM 17/11/2011: removed everything except libpq proper;
-#  as per instructions in libpq documentation.
-#  If it turns out the rest was needed, reenable it.
-.IF "$(SYSTEM_POSTGRESQL)"=="YES"
-LIBPQ_LINK=-lpq
-.ELSE #SYSTEM_POSTGRESQL==NO
-.IF "$(GUI)$(COM)"=="WNTMSC"
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib
-.ELSE
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
-.ENDIF
-POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
-POSTGRESQL_LIB=
-.ENDIF
-
 SHL2TARGET=postgresql-sdbc-impl.uno
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
 LIB2OBJFILES= \