configure.ac | 2 +- distro-configs/LibreOfficeLinux.conf | 1 + distro-configs/LibreOfficeMacOSX.conf | 1 + distro-configs/LibreOfficeOpenBSD.conf | 1 + distro-configs/LibreOfficeWin32.conf | 1 + distro-configs/LibreOfficeWin64.conf | 4 ++-- 6 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit 1c500ac128279d54f8c9ef841c15f43229c5ed11 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Apr 30 10:44:44 2013 +0300 Fix 64-bitness option Also, don't claim TDF would be doing 64-bit Windows builds. Change-Id: I3abdb13cf7b29c6d249d49fd6f66ce1b9993d97e diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 1385ded..7afbd60 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -1,5 +1,4 @@ ---with-vendor=The Document Foundation ---enable-cl-x64 +--enable-64-bit --enable-postgresql-sdbc --disable-gtk --enable-scripting-beanshell commit 0e1cc9968522b602c345aae33c4aac4c5bccd274 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Apr 30 10:35:08 2013 +0300 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 diff --git a/configure.ac b/configure.ac index bc20dec..548951b 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 dbbdcb7..b349db6 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 367d4c8..8ecbc82 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 6a52daf..9b2706c 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 3e99f74..e07584a 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 0c17d07..1385ded 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits