Kaydet (Commit) 0e1cc996 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst b399c1a3
...@@ -7769,7 +7769,7 @@ fi ...@@ -7769,7 +7769,7 @@ fi
dnl =================================================================== dnl ===================================================================
dnl Check for PostgreSQL stuff dnl Check for PostgreSQL stuff
dnl =================================================================== dnl ===================================================================
if test "x$enable_postgresql_sdbc" != "xno"; then if test "$enable_postgresql_sdbc" = yes; 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,6 +23,7 @@ ...@@ -23,6 +23,7 @@
--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,6 +7,7 @@ ...@@ -7,6 +7,7 @@
--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,6 +12,7 @@ ...@@ -12,6 +12,7 @@
--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,6 +5,7 @@ ...@@ -5,6 +5,7 @@
--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
......
--with-vendor=The Document Foundation --with-vendor=The Document Foundation
--enable-cl-x64 --enable-cl-x64
--enable-postgresql-sdbc
--disable-gtk --disable-gtk
--enable-scripting-beanshell --enable-scripting-beanshell
--enable-scripting-javascript --enable-scripting-javascript
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment