[lmi-commits] [lmi] master 8f40291 5/5: Merge branch 'master' of git.sv.gnu.org:/srv/git/lmi

[Greg Chicares]

branch: master
commit 8f40291f7965c04dd0b7dd90c82eed3fb788ccc8
Merge: fd65f39 0778129
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/lmi
    
    Resolve overlapping pushes.
---
 Makefile.am  |    1 +
 configure.ac |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 2c35293..e120e20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -812,6 +812,7 @@ test_math_functors_CXXFLAGS = $(AM_CXXFLAGS)
 test_mc_enum_SOURCES = \
   $(common_test_objects) \
   calendar_date.cpp \
+  ce_product_name.cpp \
   datum_base.cpp \
   facets.cpp \
   global_settings.cpp \
diff --git a/configure.ac b/configure.ac
index 799b6bd..e00fbe8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -556,7 +556,8 @@ fi
 if test "x$GXX" == "xyes"; then
     if test "$CLANG" = "yes"; then
         cxx_warnings_flags="$cxx_warnings_flags \
-            -Wno-inconsistent-missing-override"
+            -Wno-inconsistent-missing-override \
+            -Wno-mismatched-tags"
     else
         cxx_warnings_flags="$cxx_warnings_flags \
         -Wctor-dtor-privacy \