diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-23 15:08:36 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-23 20:31:57 +0100 |
commit | c97d74b5f0608866bad3f7ae943811bdff4f7986 (patch) | |
tree | 1c7ec8a333f138e4d90a3c6a497d35f1da64c975 /distro-configs | |
parent | 95780ec73990f96dc16fc677c895d00fa1360008 (diff) |
fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part.
Replaced --enable-ext-postgresql-sdbc with --disable-postgresql-sdbc.
Renamed postgresql-sdbc.uno{.ini,rc} to consistent postgresql-sdbc.ini
(which made the code a little easier).
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
(cherry picked from commit 3a7ae48b6f610899200ae2800706533f7c4c9f80)
Conflicts:
configure.in
connectivity/source/drivers/postgresql/makefile.mk
Diffstat (limited to 'distro-configs')
-rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeMacOSX.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeWin32.conf | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index f498df06981a..4b77cbae6f96 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -36,7 +36,6 @@ --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-nlpsolver ---enable-ext-postgresql-sdbc --enable-epm --enable-cairo --enable-binfilter diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 7e7af463acd5..108ef81c9d71 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -10,7 +10,6 @@ --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-nlpsolver ---enable-ext-postgresql-sdbc --enable-extension-integration --enable-online-update --without-system-postgresql diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index fc267e24bc05..f608e9ba3391 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -16,5 +16,4 @@ --enable-ext-presenter-console --enable-ext-pdfimport --enable-ext-nlpsolver ---enable-ext-postgresql-sdbc --enable-online-update |