patch from Levon

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 5e202115541acece508d4d9936730a22738eded2..de99f8b4ef6382c7b1638a00d83edf8f35ca3fb5 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -187,7 +187,7 @@ dnl Check the version of g++
       2.95.1)  CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
       2.95.*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       2.96*)  CXXFLAGS="-g $lyx_opt -fno-exceptions";;
-      2.97*)   CXXFLAGS="-g $lyx_opt -fhonor-std -fno-builtin -ffunction-sectons -fdata-sections";;
+      2.97*)   CXXFLAGS="-g $lyx_opt -fvtable-thunks -fno-builtin -ffunction-sections -fdata-sections";;
       *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       *)       CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
     esac
@@ -196,18 +196,18 @@ dnl Check the version of g++
   fi
   if test x$with_warnings = xyes ; then
     case $gxx_version in
-       2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
-       2.96*)  CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
-       2.97*)  CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
-       *)      CXXFLAGS="$CXXFLAGS -W -Wall -Wno-return-type";;
+       2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+       2.96*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
+       2.97*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
+       *)      CXXFLAGS="$CXXFLAGS -W -Wall";;
     esac
     if test $lyx_devel_version = yes ; then
        case $gxx_version in
            2.95.*) ;;
            2.96*) ;;
-           2.97*) ;;
+           2.97*) CXXFLAGS="$CXXFLAGS -Wconversion -Winline";;
            *2.91*) ;;
-           *) CXXFLAGS="$CXXFLAGS -pedantic";;
+           *) ;;
         esac
     fi
   fi
@@ -299,17 +299,15 @@ dnl    count template, if not the old HP version is assumed.
 AC_DEFUN(LYX_STD_COUNT,[
 AC_CACHE_CHECK(for conforming std::count,lyx_cv_std_count,
  [AC_TRY_COMPILE([
-#include <string>
 #include <algorithm>
-using std::string;
 using std::count;
-int countChar(string const & a, char const c)
+int countChar(char * b, char * e, char const c)
 {
-        return count(a.begin(), a.end(), c);
+        return count(b, e, c);
 }
 ],[
-    string a("hello");
-    int i = countChar(a, 'l');
+    char a[] = "hello";
+    int i = countChar(a, a + 5, 'l');
 ],lyx_cv_std_count=yes,lyx_cv_std_count=no)
 ])
 if test $lyx_cv_std_count = yes ; then
@@ -935,3 +933,35 @@ AC_SUBST(FRONTEND_LDFLAGS)
 AC_SUBST(FRONTEND_INCLUDES)
 AC_SUBST(FRONTEND_LIBS)
 ])
+
+
+dnl Check things are declared in headers to avoid errors or warnings.
+dnl Called like LYX_CHECK_DECL(function, headerfile)
+dnl Defines HAVE_DECL_{FUNCTION}
+AC_DEFUN(LYX_CHECK_DECL,
+[AC_MSG_CHECKING(if $1 is declared by header $2)
+tr_func=`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+
+tr_hdr=`echo $2 | tr . _`
+AC_CACHE_VAL([lyx_cv_declare_${tr_hdr}_$1],
+[AC_EGREP_HEADER($1, $2, [eval "lyx_cv_declare_${tr_hdr}_$1=yes"], [eval "lyx_cv_declare_${tr_hdr}_$1=no"])])
+if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
+        AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func})
+        AC_MSG_RESULT(yes)
+else
+        AC_MSG_RESULT(no)
+fi])
+
+dnl This is the multiple headers version of the LYX_CHECK_DECL macro above.
+dnl Called like LYX_CHECK_DECL_HDRS(function, file1 file2 file3)
+AC_DEFUN(LYX_CHECK_DECL_HDRS,
+[ got="no"
+for I in $2; do
+tr_hdr=`echo $I | tr . _`
+if test "${got}" = "no"; then
+    LYX_CHECK_DECL($1, $I)
+fi
+if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
+     got="yes"
+fi
+done])