From 8644c32d388ad66871990e856f8a4e509b7c9323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 16 Oct 2002 09:22:46 +0000 Subject: [PATCH] increase template depth for some versions of g++ git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5424 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 4 ++++ config/lyxinclude.m4 | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 186ca8d397..e1da361f4f 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2002-10-16 Lars Gullik Bjønnes + + * lyxinclude.m4: increase template depth for some versions of g++. + 2002-10-15 Lars Gullik Bjønnes * configure.in,configure.ac: make the AM_CONDITIONAL check a bit diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 1caae2373e..47e26c640a 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -206,9 +206,9 @@ if test x$GXX = xyes; then CXXFLAGS="$ac_save_CXXFLAGS" else case $gxx_version in - 2.95.1) CXXFLAGS="$lyx_opt -fpermissive";; - 2.95.*) CXXFLAGS="$lyx_opt -Wno-non-template-friend";; - 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions -Wno-non-template-friend";; + 2.95.1) CXXFLAGS="$lyx_opt -fpermissive -ftemplate-depth-30";; + 2.95.*) CXXFLAGS="$lyx_opt -Wno-non-template-friend -ftemplate-depth-30";; + 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend";; 3.0*) CXXFLAGS="$lyx_opt";; 3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";; 3.2*) CXXFLAGS="$lyx_opt -fno-exceptions";;