From 7a82a0bbf5f70fc1a4a6617c4c05dda82630a200 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 15 May 2020 00:00:06 +0200
Subject: [PATCH] Assume dlerror() function is always available when dlopen()
 is

Remove separate checks for dlerror() which don't seem to be needed under
any platform any longer.

No real changes, just slim down configure/CMake a tiny bit.
---
 build/cmake/setup.cmake       |  1 -
 build/cmake/setup.h.in        |  3 --
 configure                     | 57 -----------------------------------
 configure.in                  |  6 ----
 include/wx/osx/config_xcode.h |  1 -
 setup.h.in                    |  3 --
 setup.h_vms                   |  3 --
 7 files changed, 74 deletions(-)

diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index c3bfa21f55..7808705b74 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -614,7 +614,6 @@ set(CMAKE_REQUIRED_LIBRARIES dl)
 check_symbol_exists(dlopen dlfcn.h HAVE_DLOPEN)
 cmake_pop_check_state()
 if(HAVE_DLOPEN)
-    check_symbol_exists(dlerror dlfcn.h HAVE_DLERROR)
     check_symbol_exists(dladdr dlfcn.h HAVE_DLADDR)
 endif()
 check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
index 0c9b66537d..613cef5ba5 100644
--- a/build/cmake/setup.h.in
+++ b/build/cmake/setup.h.in
@@ -1086,9 +1086,6 @@
 /* Define if wchar_t is distinct type in your compiler. */
 #cmakedefine wxWCHAR_T_IS_REAL_TYPE 1
 
-/* Define if you have the dlerror function.  */
-#cmakedefine HAVE_DLERROR 1
-
 /* Define if you have the dladdr function.  */
 #cmakedefine HAVE_DLADDR 1
 
diff --git a/configure b/configure
index 9e469df421..9b6e686b28 100755
--- a/configure
+++ b/configure
@@ -32744,63 +32744,6 @@ done
 
 
                         if test "$HAVE_DL_FUNCS" = 1; then
-                for ac_func in dlerror
-do :
-  ac_fn_c_check_func "$LINENO" "dlerror" "ac_cv_func_dlerror"
-if test "x$ac_cv_func_dlerror" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLERROR 1
-_ACEOF
- $as_echo "#define HAVE_DLERROR 1" >>confdefs.h
-
-else
-
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlerror in -ldl" >&5
-$as_echo_n "checking for dlerror in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $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 dlerror ();
-int
-main ()
-{
-return dlerror ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlerror=yes
-else
-  ac_cv_lib_dl_dlerror=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_dl_dlerror" >&5
-$as_echo "$ac_cv_lib_dl_dlerror" >&6; }
-if test "x$ac_cv_lib_dl_dlerror" = xyes; then :
-  $as_echo "#define HAVE_DLERROR 1" >>confdefs.h
-
-fi
-
-
-
-fi
-done
-
                 for ac_func in dladdr
 do :
   ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr"
diff --git a/configure.in b/configure.in
index 6c521274c6..4bf3edd290 100644
--- a/configure.in
+++ b/configure.in
@@ -5390,12 +5390,6 @@ if test "$TOOLKIT" != "MSW"; then
 
             dnl check also for dlerror()
             if test "$HAVE_DL_FUNCS" = 1; then
-                AC_CHECK_FUNCS(dlerror,
-                    AC_DEFINE(HAVE_DLERROR),
-                    [
-                        AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
-                    ]
-                )
                 AC_CHECK_FUNCS(dladdr,
                     AC_DEFINE(HAVE_DLADDR),
                     [
diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index a1ceef066a..cafe26808e 100644
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -87,7 +87,6 @@
 #define SIZEOF_LONG_LONG 8
 #define wxSIZE_T_IS_ULONG 1
 #define wxWCHAR_T_IS_REAL_TYPE 1
-#define HAVE_DLERROR 1
 #define HAVE_FCNTL 1
 #define HAVE_GETHOSTBYNAME 1
 #define HAVE_GETSERVBYNAME 1
diff --git a/setup.h.in b/setup.h.in
index b192d1d84b..59a8fce331 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -1086,9 +1086,6 @@
 /* Define if wchar_t is distinct type in your compiler. */
 #undef wxWCHAR_T_IS_REAL_TYPE
 
-/* Define if you have the dlerror function.  */
-#undef HAVE_DLERROR
-
 /* Define if you have the dladdr function.  */
 #undef HAVE_DLADDR
 
diff --git a/setup.h_vms b/setup.h_vms
index 42461b9b04..ddb49c8cce 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -1194,9 +1194,6 @@ typedef pid_t GPid;
 /* Define if wchar_t is distinct type in your compiler. */
 #define wxWCHAR_T_IS_REAL_TYPE 1
 
-/* Define if you have the dlerror function.  */
-#define HAVE_DLERROR 1
-
 /* Define if you have the dladdr function.  */
 #undef HAVE_DLADDR