diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-02-13 18:47:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 18:47:23 +0100 |
| commit | cfef27e56ef3246a261ee0bf2810a46c08eebf8f (patch) | |
| tree | ac66ba3d1f7a037ad51f21bd54a236d5388f5916 /configure.ac | |
| parent | Merge pull request #3753 from LabNConsulting/working/master/topotest-l3mdev=1 (diff) | |
| parent | tests: add C++ header compatibility smoke test (diff) | |
| download | frr-cfef27e56ef3246a261ee0bf2810a46c08eebf8f.tar.xz frr-cfef27e56ef3246a261ee0bf2810a46c08eebf8f.zip | |
Merge pull request #3622 from mjstapp/fix_cpp_compile
libs, daemons: changes to permit c++ compilation
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 17227f2e0..936e1ccda 100755 --- a/configure.ac +++ b/configure.ac @@ -147,7 +147,7 @@ dnl - specifically, options to control warnings AC_USE_SYSTEM_EXTENSIONS AC_DEFUN([AC_C_FLAG], [{ - m4_pushdef([cachename],[m4_translit([frr_cv_$1],[ =-],[___])]) + m4_pushdef([cachename],[m4_translit([frr_cv_$1],[ =-+],[____])]) AC_CACHE_CHECK([[whether $CC supports $1]], cachename, [ AC_LANG_PUSH([C]) ac_c_flag_save="$CFLAGS" @@ -261,6 +261,9 @@ fi AC_C_FLAG([-Wno-unused-parameter]) AC_C_FLAG([-Wno-missing-field-initializers]) +AC_C_FLAG([-Wc++-compat], [], [CXX_COMPAT_CFLAGS="-Wc++-compat"]) +AC_SUBST([CXX_COMPAT_CFLAGS]) + dnl ICC emits a broken warning for const char *x = a ? "b" : "c"; dnl for some reason the string consts get 'promoted' to char *, dnl triggering a const to non-const conversion warning. |