configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 93f9451340957dae29a6b3ccec127a99a03ffd31
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Sat Sep 27 07:55:48 2014 +0200
fdo#84008: make configure fail if no std::shared_ptr available for collada
To avoid that missing std::shared_ptr support disables collada support
silently. I guess this caused the prolems with the linux packages.
In 4.3.1 packages it causes crash because there disabled
collada support was not handled very well (UI part of dae/kmz
support was not disabled, so user can insert a file, but the
converter libraries are missing)
In 4.3.2 packages collada support is also disabled, but in this case
the option to insert dae/kmz file is not available either.
Change-Id: Ic74e935ab639c348f1c55dc206d5fffa439d240d
diff --git a/configure.ac b/configure.ac
index 3981c49..4b81b0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10368,7 +10368,10 @@ dnl Check whether to enable COLLADA support
dnl ===================================================================
AC_MSG_CHECKING([whether to enable COLLADA support])
ENABLE_COLLADA=
-if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE" -a
"$have_std_shared_ptr" = "yes"; then
+if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE"; then
+ if test "$have_std_shared_ptr" = "no"; then
+ AC_MSG_ERROR([Collada support needs std::shared_ptr. Use a newer C++
compiler])
+ fi
AC_MSG_RESULT([yes])
ENABLE_COLLADA=TRUE
AC_DEFINE(HAVE_FEATURE_COLLADA,1)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
