summaryrefslogtreecommitdiffstats
path: root/configure.in.in
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2021-07-25 17:48:10 +0900
committerMichele Calgaro <[email protected]>2021-07-27 09:40:09 +0900
commitd238093c89cd17a06ca82a71db5e361ce5db39d0 (patch)
treee3bb7ab237f2ccd747ee6e3a48a8c21ae5adf887 /configure.in.in
parentd63c9d696eb6e2539528b99afc21f4086c9defe3 (diff)
downloadkoffice-d238093c89cd17a06ca82a71db5e361ce5db39d0.tar.gz
koffice-d238093c89cd17a06ca82a71db5e361ce5db39d0.zip
Fixed FTBFS caused by usage of dynamic exception specification, no longer accepted in c++17.r14.0.11
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 085b8b6c98a2893a8bb7303b40c88d417f40cdbe)
Diffstat (limited to 'configure.in.in')
-rw-r--r--configure.in.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.in.in b/configure.in.in
index fcc96492..3f2a9fb5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -293,7 +293,6 @@ then
AC_LANG_CPLUSPLUS
SAVED_CXXFLAGS="$CXXFLAGS"
for CXX_STD_TEST in "" 11 14 17; do
- CXXFLAGS="$SAVED_CXXFLAGS"
if test "x$CXX_STD_TEST" = "x"; then
AC_MSG_CHECKING([OpenEXR build with default C++ standard])
OPENEXR_CXXFLAGS=""
@@ -301,7 +300,7 @@ then
AC_MSG_CHECKING([OpenEXR build with C++$CXX_STD_TEST])
OPENEXR_CXXFLAGS="-std=c++$CXX_STD_TEST"
fi
- CXXFLAGS="$SAVED_CXXFLAGS $OPENEXR_CFLAGS $OPENEXR_CXXFLAGS"
+ CXXFLAGS="$SAVED_CXXFLAGS $USE_EXCEPTIONS $OPENEXR_CFLAGS $OPENEXR_CXXFLAGS"
AC_TRY_COMPILE([
#include <ImfRgbaFile.h>
],[ ],