gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/96642c60 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e0fc59b8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0f4e84ec (commit)
	from  https://github.com/Gnucash/gnucash/commit/89336269 (commit)



commit 96642c608feb0a947a6b676ee22474536f6cd3b7
Merge: 8933626 e0fc59b
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Aug 1 15:04:51 2017 +0200

    Merge branch 'master' of https://github.com/0-wiz-0/gnucash


commit e0fc59b8b1ab5db5637484fe2d640a00e5106da3
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Sat Jul 29 12:02:13 2017 +0200

    Use proper glib2 include path.

diff --git a/src/register/register-gnome/gnucash-cursor.h b/src/register/register-gnome/gnucash-cursor.h
index dc0b95c..092e07f 100644
--- a/src/register/register-gnome/gnucash-cursor.h
+++ b/src/register/register-gnome/gnucash-cursor.h
@@ -21,7 +21,7 @@
 #ifndef GNUCASH_CURSOR_H
 #define GNUCASH_CURSOR_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "gnucash-sheet.h"
 
 /** @ingroup Register
diff --git a/src/register/register-gnome/table-gnome.c b/src/register/register-gnome/table-gnome.c
index 8f9650e..98565cb 100644
--- a/src/register/register-gnome/table-gnome.c
+++ b/src/register/register-gnome/table-gnome.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #include "gnucash-sheet.h"
 #include "gnucash-sheetP.h"

commit 0f4e84ec0c0e96b405f34a05f24d9a1b8513f476
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Thu Jul 27 12:14:19 2017 +0200

    Use portable test(1) operator.

diff --git a/configure.ac b/configure.ac
index a54f375..2c1538f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -989,7 +989,7 @@ AC_SUBST([GTEST_HEADERS], [$ac_cv_gtest_headers])
 AC_SUBST([GMOCK_SRC_PATH], [$ac_cv_gmock_src_path])
 AC_SUBST([GMOCK_SRC], [$ac_cv_gmock_root])
 AC_SUBST([GMOCK_HEADERS], [$ac_cv_gmock_headers])
-AM_CONDITIONAL([GOOGLE_TEST_LIBS], [test "x$ac_cv_have_gtest_libs" == "xyes"])
+AM_CONDITIONAL([GOOGLE_TEST_LIBS], [test "x$ac_cv_have_gtest_libs" = "xyes"])
 ### --------------------------------------------------------------------------
 ### Register2
 AC_ARG_ENABLE( register2,



Summary of changes:
 configure.ac                                 | 2 +-
 src/register/register-gnome/gnucash-cursor.h | 2 +-
 src/register/register-gnome/table-gnome.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)