[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf

[Tor Lillqvist]

 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   |    1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 788c152cc69a2dcb63c0dc1f1fa9ec093daa780b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Apr 30 12:12:13 2013 +0300

    Revert "Don't enable postgresql-sdbc by default"
    
    I simply didn't have the krb5-devel package installed, and assumed there was
    something more complicated going on.
    
    This reverts commit 0e1cc9968522b602c345aae33c4aac4c5bccd274.
    
    Conflicts:
    	distro-configs/LibreOfficeWin64.conf
    
    Change-Id: Ie3b226678862ed6388bcf1bf105da0b996f653d1

diff --git a/configure.ac b/configure.ac
index 548951b..bc20dec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7769,7 +7769,7 @@ fi
 dnl ===================================================================
 dnl Check for PostgreSQL stuff
 dnl ===================================================================
-if test "$enable_postgresql_sdbc" = yes; then
+if test "x$enable_postgresql_sdbc" != "xno"; 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 b349db6..dbbdcb7 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -23,7 +23,6 @@
 --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 8ecbc82..367d4c8 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -7,7 +7,6 @@
 --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 9b2706c..6a52daf 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -12,7 +12,6 @@
 --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 e07584a..3e99f74 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -5,7 +5,6 @@
 --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 7afbd60..ea31d83 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,5 +1,4 @@
 --enable-64-bit
---enable-postgresql-sdbc
 --disable-gtk
 --enable-scripting-beanshell
 --enable-scripting-javascript