[Libreoffice-commits] core.git: configure.ac
Stephan Bergmann
sbergman at redhat.com
Thu May 18 15:01:25 UTC 2017
configure.ac | 31 -------------------------------
1 file changed, 31 deletions(-)
New commits:
commit 19e3af45fc8b53092f79e44485ac46b2ac80a197
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 6 11:46:47 2017 +0100
Remove some dated configure checks after LO 5.4 branch-off
See b167466147baec95a3b123a07d648fc2589bc3c9 "Remove HAVE_CXX11_CONSTEXPR,
always true now" and f4884d051f1eea07a0fe371834cb7c1da1cbee07 "Remove
HAVE_CXX11_UTF16_STRING_LITERAL, always true now". By now, any outdated
builders where this would fail should have been identified and taken care of.
Change-Id: If36354210f847718a507da490ccf158db8cea34a
Reviewed-on: https://gerrit.libreoffice.org/34922
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/configure.ac b/configure.ac
index 7286781a7f08..e535e9b7f871 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6314,23 +6314,6 @@ CXXFLAGS=$save_CXXFLAGS
AC_SUBST(CXXFLAGS_CXX11)
-AC_MSG_CHECKING([whether $CXX supports C++11 constexpr])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- struct S {
- int n_;
- constexpr S(int n): n_(n) {}
- };
- ]])], [cxx11_constexpr=yes], [cxx11_constexpr=no])
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-AC_MSG_RESULT([$cxx11_constexpr])
-if test "$cxx11_constexpr" = no; then
- AC_MSG_ERROR([Your $CXX does not support 'constexpr'. This is no longer supported.])
-fi
-
AC_MSG_CHECKING([whether $CXX supports C++14 constexpr])
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
@@ -6384,20 +6367,6 @@ if test "$cxx11_ref_qualifier" = yes; then
AC_DEFINE([HAVE_CXX11_REF_QUALIFIER])
fi
-AC_MSG_CHECKING([whether $CXX supports C++11 char16_t string literals])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- auto s = u"";
- ]])], [cxx11_utf16_string_literal=yes], [cxx11_utf16_string_literal=no])
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-AC_MSG_RESULT([$cxx11_utf16_string_literal])
-if test "$cxx11_utf16_string_literal" = no; then
- AC_MSG_ERROR([Your $CXX does not support UTF-16 string literals. This is no longer supported.])
-fi
-
dnl _Pragma support (may require C++11)
if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
AC_MSG_CHECKING([whether $CXX supports _Pragma operator])
More information about the Libreoffice-commits
mailing list