diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-12 12:52:17 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-12 12:52:17 +0100 |
| commit | 60155b048c6645b9d3415d82e97099ec44b1a72a (patch) | |
| tree | 330b2b76d2f1d6ef49fb7fe70379644b4ad60ecb | |
| parent | Remove unnecessary catalog state (unsupported in firebird). (diff) | |
| download | core-60155b048c6645b9d3415d82e97099ec44b1a72a.tar.gz core-60155b048c6645b9d3415d82e97099ec44b1a72a.zip | |
Enable firebird by default, disable as default embedded driver.
Change-Id: I4907b8b7a3b9ab767132d35b5c3539d52d122660
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | dbaccess/source/core/misc/dsntypes.cxx | 5 |
2 files changed, 4 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 1c99297dced5..bcb8513465bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1170,10 +1170,10 @@ AC_ARG_ENABLE(lotuswordpro, ,enable_lotuswordpro=yes) AC_ARG_ENABLE(firebird-sdbc, - AS_HELP_STRING([--enable-firebird-sdbc], + AS_HELP_STRING([--disable-firebird-sdbc], [Enable the build of the Firebird-SDBC driver. Work in progress, use only if you are hacking on it.]), -,enable_firebird_sdbc=no) +,enable_firebird_sdbc=yes) AC_ARG_ENABLE(coretext, AS_HELP_STRING([--enable-coretext], @@ -1447,17 +1447,6 @@ AC_ARG_WITH(system-firebird, driver. If fb_config is not in PATH, use FBCONFIG to point to it.]),, [with_system_firebird="$with_system_libs"]) -# To be replaced with IBPP, in case we want ot use it -dnl AC_ARG_WITH(libibpp-path, -dnl AS_HELP_STRING([--with-libibpp-path], -dnl [Use this Firebird C++ API (libibpp) installation for building -dnl the Firebird-SDBC extension.]) -dnl [ -dnl Usage: --with-libibpp-path=<absolute path to -dnl your libibpp installation> -dnl ], -dnl ,) - AC_ARG_WITH(system-hsqldb, AS_HELP_STRING([--with-system-hsqldb], [Use hsqldb already on system.])) @@ -8099,7 +8088,7 @@ dnl =================================================================== dnl Check for Firebird stuff dnl =================================================================== ENABLE_FIREBIRD_SDBC="" -if test "x$enable_firebird_sdbc" != "xno"; then +if test "x$enable_firebird_sdbc" = "xyes"; then SCPDEFS="$SCPDEFS -DWITH_FIREBIRD_SDBC" diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 806e117bbd84..aa24ed9da541 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -322,11 +322,8 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const } } if ( sEmbeddedDatabaseURL.isEmpty() ) -#ifdef ENABLE_FIREBIRD_SDBC - sEmbeddedDatabaseURL = "sdbc:embedded:firebird"; -#else sEmbeddedDatabaseURL = "sdbc:embedded:hsqldb"; -#endif + return sEmbeddedDatabaseURL; } //------------------------------------------------------------------------- |