read the ChangeLog... no huge changes .. but some might get reversed...

[features.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 7209fa1b7a1d35c4eb55db98cc538cca0de784b2..3e8a6600790d46c2d1d76472d3a311cc7f8cc006 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -183,9 +183,9 @@ dnl Check the version of g++
     CXXFLAGS="$ac_save_CXXFLAGS"
   elif test $ac_cv_prog_cxx_g = yes; then
     case $gxx_version in
-      2.7*) CXXFLAGS="$lyx_opt";;
       2.95.1) CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti";;
       2.95.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+      2.96*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       *2.91.*) CXXFLAGS="-g $lyx_opt -Wno-return-type -fno-exceptions -fno-rtti";;
       *)    CXXFLAGS="-g $lyx_opt -fno-exceptions -fno-rtti";;
     esac
@@ -195,11 +195,13 @@ dnl Check the version of g++
   if test x$with_warnings = xyes ; then
     case $gxx_version in
        2.95.*) CXXFLAGS="$CXXFLAGS -Wall -W -Wconversion";;
+       2.96*) CXXFLAGS="$CXXFLAGS -Wall -W -Wconversion";;
        *) CXXFLAGS="$CXXFLAGS -ansi -Wall -W";;
     esac
     if test $lyx_devel_version = yes ; then
        case $gxx_version in
            2.95.*) ;;
+           2.96*) ;;
            *) CXXFLAGS="$CXXFLAGS -pedantic";;
         esac
     fi