diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-01 21:59:09 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-01 22:56:24 +0100 |
| commit | 44ec239eba3b652fc8dbe1e0eb66c7f9ed018137 (patch) | |
| tree | 989bd3472a14b1f5463ecae398e6333ca8e4cf9f /connectivity | |
| parent | 74283f6976c727233ca330a1e9bf6ee4f52f86c5 (diff) | |
Internal libpq (PostgreSQL client lib)
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/prj/build.lst | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index dae34996ec58..fd358fa30d3a 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : shell TRANSLATIONS:translations comphelper MOZ:moz svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL +cn connectivity : shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index e49898166e56..615b26b7e097 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -101,11 +101,18 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map # 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" .IF "$(GUI)"=="WNT" LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib .ELSE LIBPQ_LINK=-lpq #-lcrypt .ENDIF +.ELSE #SYSTEM_POSTGRESQL==NO +LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a +POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql +POSTGRESQL_LIB= +.ENDIF + SHL2TARGET=postgresql-sdbc-impl.uno LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib LIB2OBJFILES= \ |