From: Alan Hourihane <alanh@fairlite.co.uk>
Date: Sat, 18 Jan 2014 21:41:47 +0000 (-0500)
Subject: * configure.ac: [SV 40790] Fix load autoconf variables.
X-Git-Tag: 4.1~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7cac0f0e3c9e5e84aa6d77b05e8aa5a7b1ade68;p=thirdparty%2Fmake.git

* configure.ac: [SV 40790] Fix load autoconf variables.

Copyright-paperwork-exempt: yes
---

diff --git a/configure.ac b/configure.ac
index 8e11328d..0922e777 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,20 +318,20 @@ AC_ARG_ENABLE([load],
   [make_cv_load="$enableval" user_load="$enableval"],
   [make_cv_load="yes"])
 
-AS_CASE([/$ac_cv_func_dlopen/$ac_cv_func_dlsym/$ac_cv_func_dlerror/],
+AS_CASE([/$ac_cv_have_decl_dlopen/$ac_cv_have_decl_dlsym/$ac_cv_have_decl_dlerror/],
   [*/no/*], [make_cv_load=no])
 
+# We might need -ldl
+AS_IF([test "$make_cv_load" = yes], [
+  AC_SEARCH_LIBS([dlopen], [dl], [], [make_cv_load=])
+  ])
+
 AS_CASE([/$make_cv_load/$user_load/],
   [*/no/*], [make_cv_load=no],
   [AC_DEFINE(MAKE_LOAD, 1,
              [Define to 1 to enable 'load' support in GNU make.])
   ])
 
-# We might need -ldl
-AS_IF([test "$make_cv_load" = yes], [
-  AC_SEARCH_LIBS([dlopen], [dl], [], [make_cv_load=])
-  ])
-
 # If we want load support, we might need to link with export-dynamic.
 # See if we can figure it out.  Unfortunately this is very difficult.
 # For example passing -rdynamic to the SunPRO linker gives a warning