diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-09-30 11:13:47 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-14 15:28:01 +0200 |
| commit | 7d81a3c2690ee7e6e9ac1df47e7afeb9f98bd8e4 (patch) | |
| tree | 0d1857f82d2507526c26a5c984dcfa5a7b9e8285 /configure.ac | |
| parent | 45c9fd73d5973cbe6278635b2ee82ac8c5b4dbb8 (diff) | |
fdo#84008: kill c++11 code from collada2gltf
... so older compliers can deal with it.
Change-Id: I7ecfa37601cae2979a5285436596175d2ebe1fe4
Reviewed-on: https://gerrit.libreoffice.org/11706
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index b8160fbaed2b..9a2133f75bba 100644 --- a/configure.ac +++ b/configure.ac @@ -6365,27 +6365,6 @@ fi AC_SUBST(CXXFLAGS_CXX11) AC_SUBST(HAVE_CXX11) -AC_MSG_CHECKING([for std::shared_ptr]) -if test "$HAVE_CXX11" = "TRUE" -a "$GCC" = "yes"; then - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - #include <memory> - using std::shared_ptr; - ])], - [ have_std_shared_ptr=yes ], - [ have_std_shared_ptr=no ] - ) - AC_LANG_POP([C++]) - CXXFLAGS=$save_CXXFLAGS -elif test "$COM" = "MSC"; then - have_std_shared_ptr=yes -else - have_std_shared_ptr=no -fi -AC_MSG_RESULT([$have_std_shared_ptr]) - dnl ================================== dnl Check for C++11 "= delete" support dnl ================================== @@ -10590,7 +10569,7 @@ 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 AC_MSG_RESULT([yes]) ENABLE_COLLADA=TRUE AC_DEFINE(HAVE_FEATURE_COLLADA,1) |