* lyx_1_4.py

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 63e54ee23612f055b2244cc11770411c9551bc12..0def2730d3c3b427b7f810629857ed79d78c1f62 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -244,7 +244,7 @@ if test x$GXX = xyes; then
     fi
     if test x$enable_warnings = xyes ; then
         case $gxx_version in
-            2.*|3.1*|3.2*|3.3*)
+            3.1*|3.2*|3.3*)
                 CPPFLAGS="-W -Wall $CPPFLAGS"
                 ;;
             *)
@@ -254,13 +254,10 @@ if test x$GXX = xyes; then
     fi
   fi
   case $gxx_version in
-      2.95.1)  AM_CXXFLAGS="-fpermissive -ftemplate-depth-30";;
-      2.95.*)  AM_CXXFLAGS="-Wno-non-template-friend -ftemplate-depth-30";;
-      2.96*)  AM_CXXFLAGS="-fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend";;
-      3.1*)    AM_CXXFLAGS="-finline-limit=500 -fno-exceptions";;
-      3.2*|3.3*)    AM_CXXFLAGS="-fno-exceptions";;
+      3.1*)    AM_CXXFLAGS="-finline-limit=500 ";;
+      3.2*|3.3*)    AM_CXXFLAGS="";;
       3.4*|4.0*)
-          AM_CXXFLAGS="-fno-exceptions"
+          AM_CXXFLAGS=""
           test $enable_pch = yes && lyx_pch_comp=yes
           ;;
       *)       AM_CXXFLAGS="";;