gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/36adb31e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/739995df (commit)
	from  https://github.com/Gnucash/gnucash/commit/1dea835c (commit)



commit 36adb31ee9c5ead127cd9f00f95f5bd4f3bc34c3
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 12 17:10:49 2017 -0700

    Fix some odd automake errors that show up only during a CMake ninja dist.

diff --git a/configure.ac b/configure.ac
index 74e7eeb..fbbfcd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,8 @@ AX_CXX_COMPILE_STDCXX_11(ext)
 # Ensure the C compiler supports C11
 AX_CHECK_COMPILE_FLAG([-std=gnu11],
                       [AX_APPEND_FLAG([-std=gnu11])],
-                      [AC_MSG_ERROR([The compiler doesn't support the C11 (gnu11) standard.])
-                      ])
+                      AC_MSG_ERROR([No C++11 Support.])
+                      )
 
 AC_SUBST(GNUCASH_MAJOR_VERSION)
 AC_SUBST(GNUCASH_MINOR_VERSION)
@@ -144,6 +144,7 @@ AM_CONDITIONAL([CLANG], [test "x$ac_cv_CLANG" = "xyes"])
 ###--------------------------------------------------------
 ### Begin C++ dependencies
 ###--------------------------------------------------------
+AC_PROG_CXX
 PKG_CHECK_MODULES(ICU4C, icu-uc, [ac_cv_ICU4C=yes], [ac_cv_ICU4C=no])
 PKG_CHECK_MODULES(ICU4C_I18N, icu-i18n, [ac_cv_ICU4C=yes], [ac_cv_ICU4C=no])
 if test x$ac_cv_ICU4C != xyes; then
@@ -939,14 +940,12 @@ fi
 if test "x$ac_cv_have_gtest_libs" = xyes; then
    ac_cv_gtest_libs="-lgtest -lgtest_main"
 else
-dnl Google test requires pthreads and this seems the easiest way to check.
     AX_PTHREAD([
     ac_cv_gtest_libs="\$(top_builddir)/common/test-core/libgtest.a $PTHREAD_CFLAGS"
-    ],[
+    ],
     AC_MSG_ERROR(
       [GTest requires pthreads, but this wasn't found.])
-      dnl Google test requires pthreads and this seems the easiest way to check.
-    ])
+    )
 fi
 
 AC_SUBST([GTEST_LIBS], [$ac_cv_gtest_libs])

commit 739995df545309ea6101a057fc26dd857299d0fe
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 12 17:09:51 2017 -0700

    Fix distribution pieces for gwenhywfar-gtk3.

diff --git a/borrowed/CMakeLists.txt b/borrowed/CMakeLists.txt
index b042e67..1d10252 100644
--- a/borrowed/CMakeLists.txt
+++ b/borrowed/CMakeLists.txt
@@ -4,4 +4,4 @@ if (WITH_AQBANKING)
   ADD_SUBDIRECTORY(gwengui-gtk3)
 endif()
 SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt Makefile.am README)
-SET(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${goffice_DIST} PARENT_SCOPE)
+SET(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${goffice_DIST} ${gwengui_gtk3_DIST} PARENT_SCOPE)
diff --git a/borrowed/gwengui-gtk3/CMakeLists.txt b/borrowed/gwengui-gtk3/CMakeLists.txt
index 9494ca4..b462e63 100644
--- a/borrowed/gwengui-gtk3/CMakeLists.txt
+++ b/borrowed/gwengui-gtk3/CMakeLists.txt
@@ -1,4 +1,5 @@
 SET (gwengui_gtk3_noinst_HEADERS
+  gtk3_gui.h
   gtk3_gui_p.h
   gtk3_gui_dialog_l.h
   gtk3_gui_dialog_p.h
diff --git a/borrowed/gwengui-gtk3/Makefile.am b/borrowed/gwengui-gtk3/Makefile.am
index 2fc0b05..b27a0dd 100644
--- a/borrowed/gwengui-gtk3/Makefile.am
+++ b/borrowed/gwengui-gtk3/Makefile.am
@@ -8,6 +8,7 @@ libgwengui_gtk3_la_LIBADD=$(GTK_LIBS) $(GWEN_LIBS)
 libgwengui_gtk3_la_LDFLAGS = -no-undefined
 
 noinst_HEADERS=\
+  gtk3_gui.h \
   gtk3_gui_p.h \
   gtk3_gui_dialog_l.h \
   gtk3_gui_dialog_p.h



Summary of changes:
 borrowed/CMakeLists.txt              |  2 +-
 borrowed/gwengui-gtk3/CMakeLists.txt |  1 +
 borrowed/gwengui-gtk3/Makefile.am    |  1 +
 configure.ac                         | 11 +++++------
 4 files changed, 8 insertions(+), 7 deletions(-)