Check for std::(tr1::)function support

CMakeLists.txt

@@ -221,6 +221,16 @@ if( BUILD_GUI AND UNIX AND NOT APPLE )
     find_package( X11 )
 endif()
 
+# Check if we can use <functional> or need <tr1/functional>
+include( CheckStdFunctional )
+check_std_functional( CXX_STD_FUNCTIONAL )
+include( CheckStdTr1Functional )
+check_std_tr1_functional( CXX_STD_TR1_FUNCTIONAL )
+if ( NOT CXX_STD_FUNCTIONAL AND NOT CXX_STD_TR1_FUNCTIONAL )
+    message( FATAL_ERROR
+        "Used compiler neither provides std::function nor std::tr1::function")
+endif()
+
 macro_optional_find_package(Echonest 2.2.0)
 macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.2.0 is needed for dynamic playlists and the infosystem")
 

CMakeModules/CheckStdFunctional.cmake

@@ -0,0 +1,13 @@
+# taglib changed filenames to be a char/wchar struct on some platforms, need to check for it
+macro (CHECK_STD_FUNCTIONAL CXX_STD_FUNCTIONAL)
+	include (CheckCXXSourceCompiles)
+	check_cxx_source_compiles(
+	"
+    #include <functional>
+    using std::function;
+    int main()
+    {
+    return 0;
+    }" ${CXX_STD_FUNCTIONAL})
+endmacro()
+

CMakeModules/CheckStdTr1Functional.cmake

@@ -0,0 +1,13 @@
+# taglib changed filenames to be a char/wchar struct on some platforms, need to check for it
+macro (CHECK_STD_TR1_FUNCTIONAL CXX_STD_TR1_FUNCTIONAL)
+	include (CheckCXXSourceCompiles)
+	check_cxx_source_compiles(
+	"
+    #include <tr1/functional>
+    using std::tr1::function;
+    int main()
+    {
+    return 0;
+    }" ${CXX_STD_TR1_FUNCTIONAL})
+endmacro()
+

src/libtomahawk/utils/Closure.h

@@ -21,9 +21,10 @@
 #ifndef CLOSURE_H
 #define CLOSURE_H
 
+#include "config.h"
 #include "DllMacro.h"
 
-#ifdef _WEBSOCKETPP_CPP11_STL_
+#if defined(_WEBSOCKETPP_CPP11_STL_) || defined(CXX_STD_FUNCTIONAL)
 #include <functional>
 using std::function;
 #else

src/tomahawk/Config.h.in

@@ -11,6 +11,7 @@
 #cmakedefine SNOW_LEOPARD
 #cmakedefine LEOPARD
 #cmakedefine HAVE_SPARKLE
+#cmakedefine CXX_STD_FUNCTIONAL
 
 #cmakedefine WITH_CRASHREPORTER
 #cmakedefine WITH_BINARY_ATTICA