[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - dbaccess/source

[Tomáš Chvátal]

 dbaccess/source/ui/dlg/odbcconfig.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 31025e3214eb62ab0e723e32411926d1976136c6
Author: Tomáš Chvátal <tchvatal at suse.com>
Date:   Thu Jan 5 16:06:10 2017 +0100

    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 at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    (cherry picked from commit 3f5584526fd4e8290dac033e1cf3d64acd25d893)
    Reviewed-on: https://gerrit.libreoffice.org/33226
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index cd1b583..a880f3c 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 )
     {