gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/90601ac4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9d46b89e (commit)
	from  https://github.com/Gnucash/gnucash/commit/ad17abed (commit)



commit 90601ac46420d52ee1625fc383ab6c5f4570649d
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Dec 3 10:07:08 2015 -0800

    Fix libdbi-0.9 crash on shutdown.
    
    Must include the header before checking the version! Since this also
    corrects the deprecation warnings, also reverts commit 29138bc.

diff --git a/configure.ac b/configure.ac
index 23f2883..48ab828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1558,9 +1558,6 @@ AC_LANG([C++])
 AX_CHECK_COMPILE_FLAG([-Wno-deprecated-register],
     [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused -Wno-deprecated-register"],
     [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused"], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wno-deprecated-declarations],
-    [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-deprecated-declarations"],
-    [AM_CXXFLAGS="${AM_CXXFLAGS}"], [-Werror])
 AC_LANG([C])
 
 AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
diff --git a/src/backend/dbi/gnc-backend-dbi.cpp b/src/backend/dbi/gnc-backend-dbi.cpp
index 41fcfb2..7bb4571 100644
--- a/src/backend/dbi/gnc-backend-dbi.cpp
+++ b/src/backend/dbi/gnc-backend-dbi.cpp
@@ -77,13 +77,6 @@ extern "C"
 #define GETPID() getpid()
 #endif
 
-#if LIBDBI_VERSION >= 900
-#define HAVE_LIBDBI_R 1
-static dbi_inst dbi_instance = NULL;
-#else
-#define HAVE_LIBDBI_R 0
-#endif
-
 /* For direct access to dbi data structs, sadly needed for datetime */
 #include <dbi/dbi-dev.h>
 }
@@ -98,6 +91,13 @@ static dbi_inst dbi_instance = NULL;
 #endif
 #endif
 
+#if LIBDBI_VERSION >= 900
+#define HAVE_LIBDBI_R 1
+static dbi_inst dbi_instance = NULL;
+#else
+#define HAVE_LIBDBI_R 0
+#endif
+
 #define GNC_HOST_NAME_MAX 255
 #define TRANSACTION_NAME "trans"
 

commit 9d46b89e1419d64bce4dd1fb6fa74cfc533ca497
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Dec 2 17:23:02 2015 -0800

    Fix compilation error in src/backend/xml/test/test-file-stuff.cpp
    
    The error was deep in stdc++lib headers, so something in the C includes
    in test-file-stuff.cpp confuses the compiler.

diff --git a/src/backend/xml/test/test-file-stuff.cpp b/src/backend/xml/test/test-file-stuff.cpp
index dc71d1e..acf912b 100644
--- a/src/backend/xml/test/test-file-stuff.cpp
+++ b/src/backend/xml/test/test-file-stuff.cpp
@@ -20,6 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *  02110-1301, USA.
  */
+#include <kvp_frame.hpp>
+
 extern "C"
 {
 #include "config.h"
@@ -39,7 +41,6 @@ extern "C"
 }
 
 #include "test-file-stuff.h"
-#include <kvp_frame.hpp>
 #include "sixtp-dom-parsers.h"
 #include "sixtp-parsers.h"
 #include "io-gncxml-gen.h"



Summary of changes:
 configure.ac                             |  3 ---
 src/backend/dbi/gnc-backend-dbi.cpp      | 14 +++++++-------
 src/backend/xml/test/test-file-stuff.cpp |  3 ++-
 3 files changed, 9 insertions(+), 11 deletions(-)