diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-04-30 10:35:08 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-04-30 10:42:29 +0300 |
commit | 0e1cc9968522b602c345aae33c4aac4c5bccd274 (patch) | |
tree | 42ae47c8e5eee252c7514d67790aa1cb5377ba50 | |
parent | b399c1a38cf7217bf530af3a78e8472d97890ac8 (diff) |
Don't enable postgresql-sdbc by default
Try to make it more likely that a build without any autogen.sh options
succeeds. We didn't even get past the autogen.sh phase on openSUSE 12.3 thanks
to some krb5 stuff needed by the postgresql-sdbc checks.
To compensate, add --enable-postgresql-sdbc to those distro-configs/*.conf
files that didn't already have --disable-postgresql-sdbc.
Change-Id: I967616993875b99d9d5a9fd0721f281bb1161a87
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeMacOSX.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeOpenBSD.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeWin32.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeWin64.conf | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bc20decdb8c3..548951b71783 100644 --- a/configure.ac +++ b/configure.ac @@ -7769,7 +7769,7 @@ fi dnl =================================================================== dnl Check for PostgreSQL stuff dnl =================================================================== -if test "x$enable_postgresql_sdbc" != "xno"; then +if test "$enable_postgresql_sdbc" = yes; then SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC" if test "$with_krb5" = "yes" -a "$enable_openssl" = "no"; then diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index dbbdcb7063e2..b349db6894ed 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -23,6 +23,7 @@ --enable-dbus --enable-extension-integration --enable-opengl +--enable-postgresql-sdbc --enable-odk --enable-lockdown --enable-kde diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 367d4c80fe95..8ecbc82fb90e 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -7,6 +7,7 @@ --enable-ext-nlpsolver --enable-extension-integration --enable-online-update +--enable-postgresql-sdbc --without-system-postgresql --disable-gtk --with-help diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 6a52dafa18e6..9b2706c696d0 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -12,6 +12,7 @@ --enable-lockdown --enable-ext-presenter-minimizer --enable-ext-wiki-publisher +--enable-postgresql-sdbc --enable-python=system --with-alloc=system --with-ant-home=/usr/local/ant diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 3e99f7416506..e07584a5fc9e 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -5,6 +5,7 @@ --without-helppack-integration --enable-extension-integration --disable-gtk +--enable-postgresql-sdbc --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-wiki-publisher diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 0c17d0783b18..1385ded5bb2f 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -1,5 +1,6 @@ --with-vendor=The Document Foundation --enable-cl-x64 +--enable-postgresql-sdbc --disable-gtk --enable-scripting-beanshell --enable-scripting-javascript |