diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-09-27 16:07:12 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-09-27 17:05:35 +0200 |
| commit | c5a1cff00cb4a3a631dacaf54ff72a4c82923eef (patch) | |
| tree | c34353ec86e44d4c8193181e923b970f83620fe8 | |
| parent | 18ec913e413b05a44bbe79768f538d93bffa9e5d (diff) | |
Actually we use C++11 on master so don't need to check std::shared_ptr support
Change-Id: Ie5f0057ef391a6b5caee50c254e317689b810a2f
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 4b81b0e87348..4bb0b5bc47a4 100644 --- a/configure.ac +++ b/configure.ac @@ -6089,27 +6089,6 @@ CXXFLAGS=$save_CXXFLAGS AC_SUBST(CXXFLAGS_CXX11) -AC_MSG_CHECKING([for std::shared_ptr]) -if test "$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 ================================== @@ -10369,9 +10348,6 @@ dnl =================================================================== AC_MSG_CHECKING([whether to enable COLLADA support]) ENABLE_COLLADA= 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) |