From 2cb48672f041144016437ca509ffc8a8ef923414 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 14 Sep 2017 11:50:37 -0700 Subject: [PATCH] Fix the actual cmake dist problem, missing macros. This reverts commit 36adb31ee9c5ead127cd9f00f95f5bd4f3bc34c3 which was the wrong approach. --- configure.ac | 11 ++++++----- macros/CMakeLists.txt | 7 +++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index fbbfcd73f5..74e7eebb58 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([No C++11 Support.]) - ) + [AC_MSG_ERROR([The compiler doesn't support the C11 (gnu11) standard.]) + ]) AC_SUBST(GNUCASH_MAJOR_VERSION) AC_SUBST(GNUCASH_MINOR_VERSION) @@ -144,7 +144,6 @@ 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 @@ -940,12 +939,14 @@ 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]) diff --git a/macros/CMakeLists.txt b/macros/CMakeLists.txt index e63554abfd..5986f55002 100644 --- a/macros/CMakeLists.txt +++ b/macros/CMakeLists.txt @@ -1,3 +1,6 @@ -SET_DIST_LIST(macros_DIST ax_pkg_swig.m4 ax_python_devel.m4 ax_swig_python.m4 binreloc.m4 - compiler-flags.m4 CMakeLists.txt legacy_macros.m4 pkg.m4) \ No newline at end of file +SET_DIST_LIST(macros_DIST ax_append_flag.m4 ax_check_compile_flag.m4 + ax_cxx_compile_stdcxx_11.m4 ax_pkg_swig.m4 ax_python_devel.m4 + ax_swig_python.m4 binreloc.m4 compiler-flags.m4 CMakeLists.txt + legacy_macros.m4 m4_ax_boost_base.m4 m4_ax_check_compile_flag.m4 + m4_ax_pthread.m4 pkg.m4)