Cleaned up the GraphicsCache mechanism, made it use shared_ptr for cleanliness

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index de99f8b4ef6382c7b1638a00d83edf8f35ca3fb5..2cd73ab4fda232f388ea0d321dd041dde9fac9ac 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -185,9 +185,11 @@ dnl Check the version of g++
   elif test $ac_cv_prog_cxx_g = yes; then
     case $gxx_version in
       2.95.1)  CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
-      2.95.*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+      2.95.2)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+      2.95.*)  CXXFLAGS="-g $lyx_opt -fno-exceptions";;
       2.96*)  CXXFLAGS="-g $lyx_opt -fno-exceptions";;
-      2.97*)   CXXFLAGS="-g $lyx_opt -fvtable-thunks -fno-builtin -ffunction-sections -fdata-sections";;
+      2.97*)   CXXFLAGS="-g $lyx_opt -fvtable-thunks -fno-builtin -ffunction-sections -fdata-sections"
+              CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1";;
       *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       *)       CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
     esac
@@ -409,7 +411,7 @@ AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[
     ])
     if test x$lyx_cv_std_string_good = xyes ; then
        AC_DEFINE(STD_STRING_IS_GOOD, 1,
-           [Define is the systems std::string is really good.])
+           [Define if the systems std::string is really good.])
     fi
 ])
 
@@ -609,7 +611,7 @@ if test $ac_cv_header_forms_h = yes; then
 #if ! defined(FL_INCLUDE_VERSION)
 "%%%"(unknown)"%%%"
 #else
-"%%%"FL_VERSION.FL_REVISION"%%%"
+"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
 #endif
 EOF
 lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
@@ -617,12 +619,12 @@ lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
   sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
 rm -f conftest*])
 case "$lyx_cv_xfversion" in 
-  "(unknown)"|0.8[1-7]) 
+  "(unknown)"|0.8[1-7]*) 
          LYX_ERROR(dnl
 Version $lyx_cv_xfversion of xforms is not compatible with LyX. 
    This version of LyX works best with versions 0.88 (recommended) and later.) ;;
-    0.88) ;;
-    0.89) LYX_WARNING(dnl
+    0.88*) ;;
+    0.89*) LYX_WARNING(dnl
 LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
 it is an unproven version and might still have some bugs. If you
 have problems[,] please use version 0.88 instead.) ;;