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";;
- *) CXXFLAGS="-g $lyx_opt -fno-exceptions -fno-rtti";;
+ 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.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+ *) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
esac
else
CXXFLAGS="$lyx_opt"
fi
if test x$with_warnings = xyes ; then
case $gxx_version in
- 2.95.*) CXXFLAGS="$CXXFLAGS -Wall -W -Wconversion";;
- *) CXXFLAGS="$CXXFLAGS -ansi -Wall -W";;
+ 2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
+ 2.96*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion";;
+ *) CXXFLAGS="$CXXFLAGS -ansi -W -Wall -Wno-return-type";;
esac
if test $lyx_devel_version = yes ; then
case $gxx_version in
2.95.*) ;;
+ 2.96*) ;;
+ *2.91*) ;;
*) CXXFLAGS="$CXXFLAGS -pedantic";;
esac
fi
AC_DEFUN(LYX_CXX_NAMESPACES,[
AC_CACHE_CHECK(for correct namespaces support,lyx_cv_cxx_namespace,
[AC_TRY_COMPILE([
- #include <vector>
- using std::vector;
+ namespace foo {
+ int bar;
+ }
],[
- vector<int> test;
+ foo::bar = 0;
return 0;
],lyx_cv_cxx_namespace=yes,lyx_cv_cxx_namespace=no)
])
[AC_CACHE_CHECK([for gettext in libintl],
gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+dnl ============== A fix is here! ======================
+dnl -lintl was not added to the LIBS variable in this case
+ [gt_cv_func_gettext_libintl=yes
+ INTLLIBS="-lintl"],
+dnl ==== end of fix
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi