diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index deb456924b..c3bfa21f55 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -616,8 +616,6 @@ cmake_pop_check_state() if(HAVE_DLOPEN) check_symbol_exists(dlerror dlfcn.h HAVE_DLERROR) check_symbol_exists(dladdr dlfcn.h HAVE_DLADDR) -else() - check_symbol_exists(shl_load dl.h HAVE_SHL_LOAD) endif() check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index c18154227b..0c9b66537d 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -984,9 +984,6 @@ /* Define if you have pthread_attr_setstacksize */ #cmakedefine HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 -/* Define if you have shl_load() */ -#cmakedefine HAVE_SHL_LOAD 1 - /* Define if you have snprintf() */ #cmakedefine HAVE_SNPRINTF 1 diff --git a/configure b/configure index fd5c48a680..9e469df421 100755 --- a/configure +++ b/configure @@ -32736,70 +32736,6 @@ if test "x$ac_cv_lib_dl_dlopen" = xyes; then : HAVE_DL_FUNCS=1 DL_LINK="-ldl $DL_LINK" -else - - for ac_func in shl_load -do : - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SHL_LOAD 1 -_ACEOF - - $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h - - HAVE_SHL_FUNCS=1 - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld in -lshl_load" >&5 -$as_echo_n "checking for dld in -lshl_load... " >&6; } -if ${ac_cv_lib_shl_load_dld+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lshl_load $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld (); -int -main () -{ -return dld (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_shl_load_dld=yes -else - ac_cv_lib_shl_load_dld=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_shl_load_dld" >&5 -$as_echo "$ac_cv_lib_shl_load_dld" >&6; } -if test "x$ac_cv_lib_shl_load_dld" = xyes; then : - - HAVE_SHL_FUNCS=1 - DL_LINK="-ldld $DL_LINK" - -fi - - -fi -done - - fi diff --git a/configure.in b/configure.in index c45f68fff5..6c521274c6 100644 --- a/configure.in +++ b/configure.in @@ -5385,20 +5385,6 @@ if test "$TOOLKIT" != "MSW"; then AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1 DL_LINK="-ldl $DL_LINK" - ], - [ - AC_CHECK_FUNCS(shl_load, - [ - AC_DEFINE(HAVE_SHL_LOAD) - HAVE_SHL_FUNCS=1 - ], - [ - AC_CHECK_LIB(shl_load, dld, - [ - HAVE_SHL_FUNCS=1 - DL_LINK="-ldld $DL_LINK" - ]) - ]) ]) ]) diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index 3a94ab9d9e..1036771c06 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -29,9 +29,6 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator; #elif defined(HAVE_DLOPEN) #include typedef void *wxDllType; -#elif defined(HAVE_SHL_LOAD) - #include - typedef shl_t wxDllType; #elif defined(__WXMAC__) #include typedef CFragConnectionID wxDllType; diff --git a/setup.h.in b/setup.h.in index 26ed7a7d14..b192d1d84b 100644 --- a/setup.h.in +++ b/setup.h.in @@ -984,9 +984,6 @@ /* Define if you have pthread_attr_setstacksize */ #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE -/* Define if you have shl_load() */ -#undef HAVE_SHL_LOAD - /* Define if you have snprintf() */ #undef HAVE_SNPRINTF diff --git a/setup.h_vms b/setup.h_vms index 92efe12b49..42461b9b04 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -1076,9 +1076,6 @@ typedef pid_t GPid; #undef HAVE_SETENV #endif -/* Define if you have shl_load() */ -#undef HAVE_SHL_LOAD - #if __CRTL_VER >= 70312000 /* Define if you have snprintf() */ #define HAVE_SNPRINTF 1