From 3731a877b3b2c5a8f5c1abd20fbbeec4484bbf46 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 10 Jul 2002 08:29:33 +0000 Subject: [PATCH] silence warnings for gcc 2.95.x git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4579 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 5 +++++ config/lyxinclude.m4 | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index c38e0c5174..0e82f6f526 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2002-07-10 Jean-Marc Lasgouttes + + * lyxinclude.m4 (LYX_PROG_CXX): add -Wno-non-template-friend for + gcc 2.95.x. + 2002-06-20 John Levon * lyxinclude.m4: add -Wno-non-template-friend diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index eb20c0c6f9..9ad53b6e41 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -207,8 +207,7 @@ if test x$GXX = xyes; then else case $gxx_version in 2.95.1) CXXFLAGS="$lyx_opt -fpermissive";; - 2.95.2) CXXFLAGS="$lyx_opt";; - 2.95.*) CXXFLAGS="$lyx_opt";; + 2.95.*) CXXFLAGS="$lyx_opt -Wno-non-template-friend";; 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions -Wno-non-template-friend";; 3.0*) CXXFLAGS="$lyx_opt";; 3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;