Merge branch 'maint'

.travis.yml

@@ -0,0 +1,11 @@
+# Test
+language: c
+compiler:
+  - gcc
+#  - clang
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get build-dep -qq gnucash
+  - sudo apt-get install -qq swig xsltproc libdbd-sqlite3
+  - sudo apt-get --reinstall install -qq language-pack-en language-pack-fr
+script: ./autogen.sh && ./configure && make && make check

configure.ac

@@ -631,7 +631,7 @@ then
         if test $? -eq 0; then
           EXTRA_SEARCH_LIBS="$(pkg-config --variable=libdir dbi)/dbd"
         else
-          EXTRA_SEARCH_LIBS="/usr/lib/dbd:/usr/lib64/dbd:${libdir}/dbd"
+          EXTRA_SEARCH_LIBS="/usr/lib/dbd:/usr/lib64/dbd:${libdir}/dbd:${prefix}/lib/dbd"
         fi]]
        )
     case $host_os in
@@ -647,7 +647,9 @@ then
 	 export LIBS="$lt_cv_dlopen_libs $LIBS"
 	 ;;
       esac
-      export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SEARCH_LIBS"
+    old_ld_library_path="$LD_LIBRARY_PATH"
+    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SEARCH_LIBS"
+    AC_MSG_NOTICE([Search Path $(LD_LIBRARY_PATH)])
     AC_MSG_CHECKING([Looking for at least one supported DBD module])
     AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC],
 				     [[if (!$lt_cv_dlopen("libdbdsqlite3.$LDEXT"$LDFUNCARGS)) return -1;
@@ -675,6 +677,7 @@ to the configure argument list and run it again.
     LIBDBI_LIBS=-ldbi
     _COMPONENTS="$_COMPONENTS dbi"
     LIBS=$saved_libs
+    LD_LIBRARY_PATH="$old_ld_library_path"
   else
     AC_MSG_ERROR([
 

src/backend/dbi/gnc-backend-dbi.c

@@ -48,6 +48,7 @@
 
 #include "gnc-uri-utils.h"
 #include "gnc-filepath-utils.h"
+#include <gnc-path.h>
 #include "gnc-locale-utils.h"
 
 #include "gnc-backend-dbi.h"
@@ -1883,13 +1884,25 @@ gnc_module_init_backend_dbi(void)
     }
 
     /* dbi_initialize returns -1 in case of errors */
-    #if HAVE_LIBDBI_R
+#if HAVE_LIBDBI_R
     if (dbi_instance)
         return;
     num_drivers = dbi_initialize_r( driver_dir, &dbi_instance );
-    #else
+#else
     num_drivers = dbi_initialize( driver_dir );
-    #endif
+#endif
+    if ( num_drivers <= 0 )
+    {
+	gchar *dir = g_build_filename(gnc_path_get_libdir(), "dbd", NULL);
+#if HAVE_LIBDBI_R
+	if (dbi_instance)
+	    return;
+	num_drivers = dbi_initialize_r( dir, &dbi_instance );
+#else
+	num_drivers = dbi_initialize( dir );
+#endif
+	g_free (dir);
+    }
     if ( num_drivers <= 0 )
     {
         PWARN( "No DBD drivers found\n" );