[Libreoffice-commits] .: configure.in connectivity/source

[Lionel Elie Mamane]

 configure.in                                       |   10 +++++-----
 connectivity/source/drivers/postgresql/makefile.mk |    9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 05b53b1b8e500b31bef1db737303725a168379da
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Nov 30 21:09:43 2011 +0100

    postgresql-sdbc: review build rules

diff --git a/configure.in b/configure.in
index a47725f..e2b9ea3 100644
--- a/configure.in
+++ b/configure.in
@@ -5400,7 +5400,7 @@ dnl ===================================================================
 dnl Check for PostgreSQL stuff
 dnl ===================================================================
 
-if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
+if test "x$enable_ext_postgresql_sdbc" = "xyes" -a "x$enable_extension_integration" != "xno"; then
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
 
     AC_MSG_CHECKING([for PostgreSQL prerequisites])
@@ -5412,12 +5412,12 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
            AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
         fi
         POSTGRESQL_INC=-I$(pg_config --includedir)
-        POSTGRESQL_LIB="-L$(pg_config --libdir) -lpq"
+        POSTGRESQL_LIB="-L$(pg_config --libdir)"
     else
         SYSTEM_POSTGRESQL=NO
         if test -n "$with_libpq_path"; then
             AC_MSG_RESULT([external libpq])
-            POSTGRESQL_LIB="-L${with_libpq_path}/lib/ -lpq"
+            POSTGRESQL_LIB="-L${with_libpq_path}/lib/"
             POSTGRESQL_INC=-I"${with_libpq_path}/include/"
         else
             AC_MSG_ERROR([not given. Please specify either --with-system-postgresql or --with-libpq-path])
@@ -5427,8 +5427,8 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
     save_CFLAGS=$CFLAGS
     save_CPPFLAGS=$CPPFLAGS
     save_LIBS=$LIBS
-    CPPFLAGS="${POSTGRESQL_INC}"
-    LIBS="${POSTGRESQL_LIB}"
+    CPPFLAGS="${CPPFLAGS} ${POSTGRESQL_INC}"
+    LIBS="${LIBS} ${POSTGRESQL_LIB}"
     AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
     AC_CHECK_LIB(pq, PQconnectdbParams, [],
         [AC_MSG_ERROR(libpq not found or too old. Need >= 9.0)], [])
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 4f2dffd..e498981 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -97,14 +97,14 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 
-# use the static version
+# 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 "$(GUI)"=="WNT"
-POSTGRESQL_LIB=libpq.lib #wsock32.lib advapi32.lib
+LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
 .ELSE
-POSTGRESQL_LIB=-lpq #-lcrypt
+LIBPQ_LINK=-lpq #-lcrypt
 .ENDIF
 SHL2TARGET=postgresql-sdbc-impl.uno
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
@@ -148,7 +148,8 @@ SHL2STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)		\
         $(SALHELPERLIB)		\
-        $(POSTGRESQL_LIB)
+        $(POSTGRESQL_LIB)	\
+        $(LIBPQ_LINK)
 
 SHL2LIBS=	$(LIB2TARGET)
 SHL2DEF=	$(MISC)$/$(SHL2TARGET).def