From 71ec4779006ae5c27bc59b14051c0e74d95fb737 Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 20 Jun 2002 22:36:02 +0000 Subject: [PATCH] add -Wno-non-template-friend for 2.96 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4443 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 4 ++++ config/lyxinclude.m4 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/ChangeLog b/config/ChangeLog index 206e51aee7..c38e0c5174 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2002-06-20 John Levon + + * lyxinclude.m4: add -Wno-non-template-friend + 2002-06-20 Jean-Marc Lasgouttes * pspell.m4: patch from Garst to help find pspell (bug 428) this diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index b43b37b78a..eb20c0c6f9 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -209,7 +209,7 @@ if test x$GXX = xyes; then 2.95.1) CXXFLAGS="$lyx_opt -fpermissive";; 2.95.2) CXXFLAGS="$lyx_opt";; 2.95.*) CXXFLAGS="$lyx_opt";; - 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions";; + 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";; 3.2*) CXXFLAGS="$lyx_opt";; -- 2.39.5