gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/36967708 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f7dfd65b (commit)
	from  https://github.com/Gnucash/gnucash/commit/c56faffb (commit)



commit 3696770812b54e35e237adf875a87e17d7766703
Merge: c56faff f7dfd65
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri May 20 15:57:36 2016 -0700

    Merge branch 'maint'

commit f7dfd65bf9f2cb441bdb2d8767f3bcdbe0319b53
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri May 20 17:02:01 2016 +0000

    Fix adjust_sql_option_string test on Windows.
    
    The linkage problem was caused by the symbol appearing in
    libgncmod-backend-dbi.dll but not libgncmod-backend-dbi.dll.a.
    Incoprorating gnc-backend-dbi.c as a source file to the test program
    instead of linking its library resolved the issue.



Summary of changes:
 src/backend/dbi/test/Makefile.am                | 5 ++---
 src/backend/dbi/test/test-backend-dbi-basic.cpp | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)