From 3f5584526fd4e8290dac033e1cf3d64acd25d893 Mon Sep 17 00:00:00 2001 From: Tomáš Chvátal Date: Thu, 5 Jan 2017 16:06:10 +0100 Subject: 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 Tested-by: Lionel Elie Mamane --- dbaccess/source/ui/dlg/odbcconfig.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'dbaccess') 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 ) { -- cgit