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 0e1cc99685
.
Conflicts:
distro-configs/LibreOfficeWin64.conf
Change-Id: Ie3b226678862ed6388bcf1bf105da0b996f653d1
This commit is contained in:
@@ -7769,7 +7769,7 @@ fi
|
|||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
dnl Check for PostgreSQL stuff
|
dnl Check for PostgreSQL stuff
|
||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
if test "$enable_postgresql_sdbc" = yes; then
|
if test "x$enable_postgresql_sdbc" != "xno"; then
|
||||||
SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
|
SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
|
||||||
|
|
||||||
if test "$with_krb5" = "yes" -a "$enable_openssl" = "no"; then
|
if test "$with_krb5" = "yes" -a "$enable_openssl" = "no"; then
|
||||||
|
@@ -23,7 +23,6 @@
|
|||||||
--enable-dbus
|
--enable-dbus
|
||||||
--enable-extension-integration
|
--enable-extension-integration
|
||||||
--enable-opengl
|
--enable-opengl
|
||||||
--enable-postgresql-sdbc
|
|
||||||
--enable-odk
|
--enable-odk
|
||||||
--enable-lockdown
|
--enable-lockdown
|
||||||
--enable-kde
|
--enable-kde
|
||||||
|
@@ -7,7 +7,6 @@
|
|||||||
--enable-ext-nlpsolver
|
--enable-ext-nlpsolver
|
||||||
--enable-extension-integration
|
--enable-extension-integration
|
||||||
--enable-online-update
|
--enable-online-update
|
||||||
--enable-postgresql-sdbc
|
|
||||||
--without-system-postgresql
|
--without-system-postgresql
|
||||||
--disable-gtk
|
--disable-gtk
|
||||||
--with-help
|
--with-help
|
||||||
|
@@ -12,7 +12,6 @@
|
|||||||
--enable-lockdown
|
--enable-lockdown
|
||||||
--enable-ext-presenter-minimizer
|
--enable-ext-presenter-minimizer
|
||||||
--enable-ext-wiki-publisher
|
--enable-ext-wiki-publisher
|
||||||
--enable-postgresql-sdbc
|
|
||||||
--enable-python=system
|
--enable-python=system
|
||||||
--with-alloc=system
|
--with-alloc=system
|
||||||
--with-ant-home=/usr/local/ant
|
--with-ant-home=/usr/local/ant
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
--without-helppack-integration
|
--without-helppack-integration
|
||||||
--enable-extension-integration
|
--enable-extension-integration
|
||||||
--disable-gtk
|
--disable-gtk
|
||||||
--enable-postgresql-sdbc
|
|
||||||
--enable-scripting-beanshell
|
--enable-scripting-beanshell
|
||||||
--enable-scripting-javascript
|
--enable-scripting-javascript
|
||||||
--enable-ext-wiki-publisher
|
--enable-ext-wiki-publisher
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
--enable-64-bit
|
--enable-64-bit
|
||||||
--enable-postgresql-sdbc
|
|
||||||
--disable-gtk
|
--disable-gtk
|
||||||
--enable-scripting-beanshell
|
--enable-scripting-beanshell
|
||||||
--enable-scripting-javascript
|
--enable-scripting-javascript
|
||||||
|
Reference in New Issue
Block a user