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.96*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
- 2.97*) CXXFLAGS="-g $lyx_opt -fhonor-std";;
+ 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"
+ 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
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
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
])
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
])
LYX_ADD_INC_DIR(lyx_cppflags,\$(top_srcdir)/src/cheaders)
fi])
+dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions
+dnl are already in the global namespace
+AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
+ AC_CACHE_CHECK(whether C library functions are already in the global namespace,
+ lyx_cv_cxx_global_cstd,
+ [AC_TRY_COMPILE([
+ #include <cctype>
+ using std::tolower;
+ ],[
+ return 0;
+ ],[lyx_cv_cxx_global_cstd=no],[lyx_cv_cxx_global_cstd=yes])])
+ if test x$lyx_cv_cxx_global_cstd = xyes; then
+ AC_DEFINE(CXX_GLOBAL_CSTD,1,
+ [Define if your C++ compiler puts C library functions in the global namespace])
+ fi
+])
dnl Usage LYX_PATH_XPM: Checks for xpm library and header
AC_DEFUN(LYX_PATH_XPM,[
#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 | \
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.) ;;
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])