anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Autotools: use -Wno-deprecated-declarations also with --disable-warnings

Browse Source 
-Wno-deprecated-declarations is needed to avoid warnings about auto_ptr being obsolete.

The old code meant that the warnings would be suppressed for development builds, but active for release builds. The new code avoids that.
This commit is contained in:
Jean-Marc Lasgouttes 2015-12-11 10:31:46 +01:00
parent b6880470b3
commit 314a121c9e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/lyxinclude.m4
View File

@ -298,7 +298,7 @@ if test x$GXX = xyes; then
fi fi
dnl Warnings are for preprocessor too dnl Warnings are for preprocessor too
if test x$enable_warnings = xyes ; then if test x$enable_warnings = xyes ; then
AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wno-deprecated-declarations" AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
fi fi
case $gxx_version in case $gxx_version in
2.*|3.*) AC_ERROR([gcc 4.x is required]);; 2.*|3.*) AC_ERROR([gcc 4.x is required]);;
@ -327,7 +327,7 @@ if test x$GXX = xyes; then
dnl The source code relies on that. dnl The source code relies on that.
AM_CXXFLAGS="$AM_CXXFLAGS -std=c++0x";; AM_CXXFLAGS="$AM_CXXFLAGS -std=c++0x";;
clang) clang)
dnl presumably all clang version support c++11. dnl presumably all clang versions support c++11.
dnl the deprecated-register warning is very annoying with Qt4.x right now. dnl the deprecated-register warning is very annoying with Qt4.x right now.
AM_CXXFLAGS="$AM_CXXFLAGS -std=c++11 -Wno-deprecated-register";; AM_CXXFLAGS="$AM_CXXFLAGS -std=c++11 -Wno-deprecated-register";;
*) *)
@ -339,6 +339,9 @@ if test x$GXX = xyes; then
LYX_CXX_CXX11 LYX_CXX_CXX11
if test $lyx_use_cxx11 = yes ; then if test $lyx_use_cxx11 = yes ; then
dnl We still use auto_ptr, which is obsoleted. Shut off the warnings.
AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-declarations"
AC_CHECK_HEADER([regex], [lyx_std_regex=yes], [lyx_std_regex=no]) AC_CHECK_HEADER([regex], [lyx_std_regex=yes], [lyx_std_regex=no])
if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then
dnl <regex> in gcc is unusable in versions less than 4.9.0 dnl <regex> in gcc is unusable in versions less than 4.9.0