gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e4d97f6d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/551e5c60 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c286448f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/46455c75 (commit)
	from  https://github.com/Gnucash/gnucash/commit/321a159a (commit)



commit e4d97f6d7466f1c0bd74785bf5cc450f08c794ba
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 7 11:46:17 2014 -0700

    Fix test-backend-dbi segfault with libdbi-0.9.0.
    
    dbi_inst must be initialized before it can be used.

diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c
index d7e88eb..b3203f0 100644
--- a/src/backend/dbi/test/test-backend-dbi-basic.c
+++ b/src/backend/dbi/test/test-backend-dbi-basic.c
@@ -36,7 +36,7 @@
 
 #if LIBDBI_VERSION >= 900
 #define HAVE_LIBDBI_R 1
-static dbi_inst dbi_instance;
+static dbi_inst dbi_instance = NULL;
 #else
 #define HAVE_LIBDBI_R 0
 #endif
@@ -597,8 +597,11 @@ test_suite_gnc_backend_dbi (void)
     dbi_driver driver = NULL;
     GList *drivers = NULL;
     #if HAVE_LIBDBI_R
+    if (dbi_instance == NULL)
+      dbi_initialize_r (NULL, &dbi_instance);
     while ((driver = dbi_driver_list_r (driver, dbi_instance)))
     #else
+    dbi_initialize (NULL);
     while ((driver = dbi_driver_list (driver)))
     #endif
     {

commit 551e5c6093f22aeee29561cae1f4c34150e5d093
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 7 11:45:40 2014 -0700

    Fix uninitialized variable warning.

diff --git a/src/plugins/bi_import/dialog-bi-import.c b/src/plugins/bi_import/dialog-bi-import.c
index 8c77779..05ef930 100644
--- a/src/plugins/bi_import/dialog-bi-import.c
+++ b/src/plugins/bi_import/dialog-bi-import.c
@@ -528,7 +528,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
     Timespec today;
     InvoiceWindow *iw;
     gchar *new_id = NULL;
- 	gint64  	denom;
+    gint64 denom = 0;
     gnc_commodity *currency;
     
     // these arguments are needed

commit c286448fdb6f9cbbbff42f2ab73f5291168111f1
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 7 11:41:21 2014 -0700

    Add note about automake 1.14 to configure.ac
    
    The note has the details, but I wasn't able to get gnucash to build with
    automake 1.14 without passing --disable-dependency-tracking regardless of
    whether I used the subdir-objects option. If I could figure out a good way
    to poison configure with automake 1.14 I would.

diff --git a/configure.ac b/configure.ac
index bb07382..92b3b4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,15 @@ GNUCASH_NANO_VERSION=0
 #storage-compatible with the current version. See the comments in
 #src/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load.
 GNUCASH_RESAVE_VERSION=19920
-# Initialize automake -- make sure we have at least version 1.9
+# Initialize automake -- make sure we have at least version 1.9 Note:
+# Automake 1.14 issues a ton of warnings about subdir-objects, which
+# will become the default in automake 2.0; unfortunately this option
+# is broken and prevents building without passing
+# --disable-dependency-tracking to configure, which make-distcheck
+# doesn't do. See
+# http://lists.gnu.org/archive/html/automake/2014-04/msg00002.html and
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 for details.
+# In the meantime the best option is to use Automake 1.13 or earlier.
 AM_INIT_AUTOMAKE([1.9 dist-bzip2])
 
 # Parse out the version number

commit 46455c75185f4ac04922dc6ab7f8b8094e55b9c9
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 7 10:23:50 2014 -0700

    Revert "Fix broken test-backend-dbi with libdbi 0.9."
    
    This reverts commit 321a159af29a9b51fe793c2528dccb74b0443bf9.
    Got two unrelated changes into a single changeset.

diff --git a/configure.ac b/configure.ac
index 2f70fc5..bb07382 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ GNUCASH_NANO_VERSION=0
 #src/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load.
 GNUCASH_RESAVE_VERSION=19920
 # Initialize automake -- make sure we have at least version 1.9
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2])
 
 # Parse out the version number
 GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION
diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c
index b3203f0..d7e88eb 100644
--- a/src/backend/dbi/test/test-backend-dbi-basic.c
+++ b/src/backend/dbi/test/test-backend-dbi-basic.c
@@ -36,7 +36,7 @@
 
 #if LIBDBI_VERSION >= 900
 #define HAVE_LIBDBI_R 1
-static dbi_inst dbi_instance = NULL;
+static dbi_inst dbi_instance;
 #else
 #define HAVE_LIBDBI_R 0
 #endif
@@ -597,11 +597,8 @@ test_suite_gnc_backend_dbi (void)
     dbi_driver driver = NULL;
     GList *drivers = NULL;
     #if HAVE_LIBDBI_R
-    if (dbi_instance == NULL)
-      dbi_initialize_r (NULL, &dbi_instance);
     while ((driver = dbi_driver_list_r (driver, dbi_instance)))
     #else
-    dbi_initialize (NULL);
     while ((driver = dbi_driver_list (driver)))
     #endif
     {



Summary of changes:
 configure.ac                             | 12 ++++++++++--
 src/plugins/bi_import/dialog-bi-import.c |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)