configure.ac | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 38a8b6da3bae314f4a49ec6489e81e31f6cfb24d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 14 15:51:55 2013 +0200
grr
Change-Id: Ib158bc873fc41bb5668a1da3d7c928f2757d80ab
diff --git a/configure.ac b/configure.ac
index abcd353..b1e910e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5690,19 +5690,18 @@ return !(i != 0 && j != 0);
CXXFLAGS=$save_CXXFLAGS
fi
- if test "$HAVE_CXX11" != "TRUE"; then
- if test -n "$CXXFLAGS_CXX11"; then
- AC_MSG_NOTICE([Disabling C++11 support])
- CXXFLAGS_CXX11=
- elif test "$CPP_LIBRARY" = LIBCPP -a $_os = Darwin; then
- AC_MSG_ERROR([Selected libc++ but C++11 support broken])
- fi
+ if test "$HAVE_CXX11" = "TRUE"; then
+ AC_DEFINE(HAVE_CXX11)
+ elif test -n "$CXXFLAGS_CXX11"; then
+ AC_MSG_NOTICE([Disabling C++11 support])
+ CXXFLAGS_CXX11=
+ elif test "$CPP_LIBRARY" = LIBCPP -a $_os = Darwin; then
+ AC_MSG_ERROR([Selected libc++ but C++11 support broken])
fi
fi
AC_SUBST(CXXFLAGS_CXX11)
AC_SUBST(HAVE_CXX11)
-AC_DEFINE(HAVE_CXX11)
dnl ==================================
dnl Check for C++11 "= delete" support
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
