Take patch 18773 from mainline: Hopefully last tweak: don't assume that we are in...

git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-2@18775 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 5cb9799ddf1d3bba67a50bc33b8dc11fc12a724d..b14307a0b09f7ad8a60a2b41f89136375c211dfa 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -4346,7 +4346,7 @@ AC_DEFUN(DEAL_II_CHECK_CTOR_DTOR_PRIVACY, dnl
   if test "x$GXX" = "xyes" ; then
     AC_MSG_CHECKING(for problem with -Wctor-dtor-privacy)
     AC_LANG(C++)
-    CXXFLAGS="-Wctor-dtor-privacy -Werror"
+    CXXFLAGS="$CXXFLAGSG -Werror"
     AC_TRY_COMPILE(
       [
         template <typename T>

diff --git a/deal.II/configure b/deal.II/configure
index f3563cc07101ed3f875885fe9f2d1bdf97db9271..059596d915024e7842d6f41e09d0d3bd4a3ea64d 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -8242,7 +8242,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-    CXXFLAGS="-Wctor-dtor-privacy -Werror"
+    CXXFLAGS="$CXXFLAGSG -Werror"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF