diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2017-04-30 04:25:22 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2017-04-30 04:25:22 +0200 |
| commit | 1d689ebfec51613fcb1fe286294c85dcbb9d8574 (patch) | |
| tree | 537db174b7033ee078f5114cb895ff971b32d6bd /configure.ac | |
| parent | b338a9dc265d7bc46a2528ffc45f7bf6fba96620 (diff) | |
| download | sciteco-1d689ebfec51613fcb1fe286294c85dcbb9d8574.tar.gz | |
removed CLANG and HAVE_SIZED_DEALLOCATION conditionals
Automakefiles could be simplified by updating CXXFLAGS
in configure.ac instead.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c710191..c341183 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,7 @@ AX_CXX_COMPILE_STDCXX(11, noext, mandatory) AC_PROG_CC AC_PROG_CC_C99 AC_PROG_SED +AC_PROG_GREP AC_PROG_INSTALL # Mainly because of Scintilla, which depends on @@ -87,8 +88,10 @@ case $host in ;; esac -# Emscripten uses Clang as well -AM_CONDITIONAL(CLANG, [$CXX --version | $GREP -E "clang|Emscripten" >/dev/null]) +# Detect Clang. Emscripten is based on Clang as well. +if $CXX --version | $GREP -E "clang|Emscripten" >/dev/null; then + CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags" +fi AC_CHECK_PROG(DATE, date, date) if [[ x$DATE = x ]]; then @@ -198,9 +201,8 @@ AC_CACHE_CHECK([if C++ compiler supports -fsized-deallocation], if [[ x$sciteco_cv_sized_deallocation_result = xyes ]]; then AC_DEFINE(HAVE_SIZED_DEALLOCATION, 1, [C++ compiler supports -fsized-deallocation]) + CXXFLAGS="$CXXFLAGS -fsized-deallocation" fi -AM_CONDITIONAL(HAVE_SIZED_DEALLOCATION, - test "$sciteco_cv_sized_deallocation_result" = yes) # # Config options |