diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index 4360634ddd..45097e02d9 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -132,21 +132,6 @@ if(NOT MSVC) endif() endif() -if(wxUSE_STL AND CMAKE_CXX_STANDARD EQUAL 98) - wx_check_cxx_source_compiles(" - std::vector moo; - std::list foo; - std::vector::iterator it = - std::find_if(moo.begin(), moo.end(), - std::bind2nd(std::less(), 3));" - wxTEST_STL - string functional algorithm vector list - ) - if(NOT wxTEST_STL) - message(FATAL_ERROR "Can't use wxUSE_STL as basic STL functionality is missing") - endif() -endif() - wx_check_cxx_source_compiles(" std::string foo, bar; foo.compare(bar); diff --git a/configure b/configure index c367798fa9..bdef4b6602 100755 --- a/configure +++ b/configure @@ -20706,46 +20706,6 @@ $as_echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostrea fi if test "$wxUSE_STL" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for basic STL functionality" >&5 -$as_echo_n "checking for basic STL functionality... " >&6; } -if ${wx_cv_lib_stl+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - #include - #include - #include -int -main () -{ -std::vector moo; - std::list foo; - std::vector::iterator it = - std::find_if(moo.begin(), moo.end(), - std::bind2nd(std::less(), 3)); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - wx_cv_lib_stl=yes -else - wx_cv_lib_stl=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_stl" >&5 -$as_echo "$wx_cv_lib_stl" >&6; } - - if test "$wx_cv_lib_stl" != yes; then - as_fn_error $? "Can't use --enable-stl as basic STL functionality is missing" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compliant std::string::compare" >&5 $as_echo_n "checking for compliant std::string::compare... " >&6; } if ${wx_cv_func_stdstring_compare+:} false; then : diff --git a/configure.in b/configure.in index 8fab1fdd69..14883df326 100644 --- a/configure.in +++ b/configure.in @@ -2002,28 +2002,6 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then fi if test "$wxUSE_STL" = "yes"; then - dnl check for basic STL functionality - AC_CACHE_CHECK([for basic STL functionality], - wx_cv_lib_stl, - [AC_TRY_COMPILE([#include - #include - #include - #include - #include ], - [std::vector moo; - std::list foo; - std::vector::iterator it = - std::find_if(moo.begin(), moo.end(), - std::bind2nd(std::less(), 3));], - wx_cv_lib_stl=yes, - wx_cv_lib_stl=no - )] - ) - - if test "$wx_cv_lib_stl" != yes; then - AC_MSG_ERROR([Can't use --enable-stl as basic STL functionality is missing]) - fi - dnl check for compliant std::string::compare AC_CACHE_CHECK([for compliant std::string::compare], wx_cv_func_stdstring_compare,