Include -dl by default.

kohler · Oct 3, 2018 · 066f282 · 066f282
1 parent 6834aba
commit 066f282
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/configure b/configure
@@ -9040,11 +9040,7 @@ if test "x$enable_dynamic_linking" = xyes; then
 
     DL_LIBS=
 
-    ac_fn_cxx_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  ac_have_dlopen=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -9082,6 +9078,10 @@ fi
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   ac_have_dlopen=yes; DL_LIBS="-ldl"
+else
+  ac_fn_cxx_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  ac_have_dlopen=yes
 else
   ac_have_dlopen=no
 fi

diff --git a/m4/click.m4 b/m4/click.m4
@@ -249,8 +249,8 @@ dnl
 AC_DEFUN([CLICK_CHECK_DYNAMIC_LINKING], [
     DL_LIBS=
     AC_CHECK_HEADERS_ONCE([dlfcn.h])
-    AC_CHECK_FUNC(dlopen, ac_have_dlopen=yes,
-        [AC_CHECK_LIB(dl, dlopen, [ac_have_dlopen=yes; DL_LIBS="-ldl"], ac_have_dlopen=no)])
+    AC_CHECK_LIB(dl, dlopen, [ac_have_dlopen=yes; DL_LIBS="-ldl"],
+        [AC_CHECK_FUNC(dlopen, ac_have_dlopen=yes, ac_have_dlopen=no)])
     if test "x$ac_have_dlopen" = xyes -a "x$ac_cv_header_dlfcn_h" = xyes; then
         AC_DEFINE([HAVE_DYNAMIC_LINKING], [1], [Define if dynamic linking is possible.])
         ac_have_dynamic_linking=yes