From: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri, 5 Jun 2009 02:42:08 +0000 (-0700)
Subject: osmesa: Link with -ldl for dlopen code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4795dd5950d4dcd7c8d421c8fb4851c193297ba1;p=mesa.git

osmesa: Link with -ldl for dlopen code

Now that the dlopen wrappers are built into libmesa.a, we need to link
standalone libOSMesa with libdl to resolve dlopen and friends on
platforms that need it.
---

diff --git a/configure.ac b/configure.ac
index 772fb299737..6f0f1f681d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -831,12 +831,12 @@ case "$mesa_driver" in
 osmesa)
     # only link libraries with osmesa if shared
     if test "$enable_static" = no; then
-        OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS"
+        OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
     else
         OSMESA_LIB_DEPS=""
     fi
     OSMESA_MESA_DEPS=""
-    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS"
+    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
     ;;
 *)
     # Link OSMesa to libGL otherwise
@@ -850,9 +850,6 @@ osmesa)
     OSMESA_PC_REQ="gl"
     ;;
 esac
-if test "$enable_static" = no; then
-    OSMESA_LIB_DEPS="$OSMESA_LIB_DEPS"
-fi
 OSMESA_PC_LIB_PRIV="$OSMESA_PC_LIB_PRIV"
 AC_SUBST([OSMESA_LIB_DEPS])
 AC_SUBST([OSMESA_MESA_DEPS])