Mesa (mesa_7_4_branch): osmesa: Link with -ldl for dlopen code

Dan Nicholson dbn at kemper.freedesktop.org
Fri Jun 5 03:00:20 UTC 2009


Module: Mesa
Branch: mesa_7_4_branch
Commit: 1e4334f62325df2af76e6776595969fa043c24fd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e4334f62325df2af76e6776595969fa043c24fd

Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Thu Jun  4 19:42:08 2009 -0700

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.
(cherry picked from commit 4795dd5950d4dcd7c8d421c8fb4851c193297ba1)

---

 configure.ac |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 967545b..667fc82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -786,12 +786,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
@@ -805,9 +805,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])




More information about the mesa-commit mailing list