silence warnings for gcc 2.95.x

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4579 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/ChangeLog b/config/ChangeLog
index c38e0c5174d99f8e8814ad08537d28658bed2908..0e82f6f526f074fbf4fa84f36b3b0c5b88a3ee61 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-10  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * lyxinclude.m4 (LYX_PROG_CXX): add -Wno-non-template-friend for
+       gcc 2.95.x.
+
 2002-06-20  John Levon  <moz@compsoc.man.ac.uk>
 
        * lyxinclude.m4: add -Wno-non-template-friend

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index eb20c0c6f9d21ebaab2d3adc7fb461ee60ebea87..9ad53b6e41e2193f7eb9d72b3abd0cc519ef04d4 100644 (file)
--- 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";;