diff options
| author | Andre Heinecke <aheinecke@intevation.de> | 2016-05-24 14:10:16 +0200 |
|---|---|---|
| committer | Andre Heinecke <aheinecke@intevation.de> | 2016-05-24 14:13:52 +0200 |
| commit | b107fc8a92bd16bc0d868c771b6334d6594e6395 (patch) | |
| tree | 0a718e32b7c461ff800e2f49b28072acfc327121 /m4 | |
| parent | 09803c4a81b9431fd4c8f30abb1c60c4c735f0cb (diff) | |
| download | gpgme-b107fc8a92bd16bc0d868c771b6334d6594e6395.tar.gz | |
Cpp: Set -std=c++11 also if CXXCPP is already set
* m4/ax_cxx_compile_stdxx.m4 (AX_CXX_COMPILE_STDCXX): Set CXXCPP if
neccessary.
--
This fixes the build with scan-build where CXXCPP is already set but
does not include stdc++11. While this deviates from the
autotools-archive version of the script it does not make sense
to me first to check if stdc++11 needs to be set and then not
set it.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_cxx_compile_stdcxx.m4 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 index 2c18e49c..de3d0121 100644 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -82,9 +82,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl CXX="$ac_save_CXX"]) if eval test x\$$cachevar = xyes; then CXX="$CXX $switch" - if test -n "$CXXCPP" ; then - CXXCPP="$CXXCPP $switch" - fi + CXXCPP="$CXXCPP $switch" ac_success=yes break fi @@ -108,9 +106,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl CXX="$ac_save_CXX"]) if eval test x\$$cachevar = xyes; then CXX="$CXX $switch" - if test -n "$CXXCPP" ; then - CXXCPP="$CXXCPP $switch" - fi + CXXCPP="$CXXCPP $switch" ac_success=yes break fi |