diff options
| author | Tomáš Chvátal <tchvatal@suse.com> | 2017-01-05 16:06:10 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-17 20:15:03 +0000 |
| commit | 31025e3214eb62ab0e723e32411926d1976136c6 (patch) | |
| tree | bf19dede659f669d22623ef89dd0ac0bd7a73415 /dbaccess | |
| parent | 9093bd7295c677fa1888d3d805fccbc07e85f1f4 (diff) | |
unixODBC changed soname to .2 so reflect it
we dlopen this library and thus we should be able to find it with any
soname, so far .1 and .2 seem to be used.
Also now the load order on linux is: .so.2 -> .so.1 -> .so
Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280
Reviewed-on: https://gerrit.libreoffice.org/32755
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit 3f5584526fd4e8290dac033e1cf3d64acd25d893)
Reviewed-on: https://gerrit.libreoffice.org/33226
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index cd1b583e1840..a880f3cccef5 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -38,8 +38,9 @@ #ifdef MACOSX #define ODBC_LIBRARY "libiodbc.dylib" #else +#define ODBC_LIBRARY_PLAIN "libodbc.so" #define ODBC_LIBRARY_1 "libodbc.so.1" -#define ODBC_LIBRARY "libodbc.so" +#define ODBC_LIBRARY "libodbc.so.2" #endif #endif @@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration() if ( !bLoaded ) bLoaded = load(ODBC_LIBRARY_1); #endif +#ifdef ODBC_LIBRARY_PLAIN + if ( !bLoaded ) + bLoaded = load(ODBC_LIBRARY_PLAIN); +#endif if ( bLoaded ) { |