Mesa (master): configure: check for dladdr via AC_CHECK_FUNC/AC_CHECK_LIB

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 39a4cc45a417bea3bb1cfbe20ea5045200f76c25
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=39a4cc45a417bea3bb1cfbe20ea5045200f76c25

Author: Pali Rohár <pali.rohar at gmail.com>
Date:   Fri Aug  8 18:31:07 2014 +0100

configure: check for dladdr via AC_CHECK_FUNC/AC_CHECK_LIB

Use both macros as in some cases using AC_CHECK_FUNCS alone may fail.
Thus HAVE_DLADDR will not be defined, and as a result most of the code
in megadriver_stub.c will not be compiled. Breaking the backwards
compatibility between older libGL/xserver(s) and DRI megadrivers.

Cc: Jon TURNEY <jon.turney at dronecode.org.uk>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
[Emil Velikov] Commit message.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 configure.ac |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index f311419..1f84f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -535,10 +535,9 @@ AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"],
 AC_SUBST([DLOPEN_LIBS])
 
 dnl Check if that library also has dladdr
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $DLOPEN_LIBS"
-AC_CHECK_FUNCS([dladdr])
-LDFLAGS="$save_LDFLAGS"
+AC_CHECK_FUNC([dladdr], [DEFINES="$DEFINES -DHAVE_DLADDR"],
+    [AC_CHECK_LIB([dl], [dladdr],
+       [DEFINES="$DEFINES -DHAVE_DLADDR"])])
 
 case "$host_os" in
 darwin*|mingw*)