st/egl: Fix build on FreeBSD.

There is no libdl on FreeBSD.  Based on patch from Thinker
<thinker@branda.to>, which is against 7.8.

This fixes fdo bug #29093.

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 5afd5627fec5daad974a0c6a77f8b548aaa92349..7c6f123cac040e138fa4ab0434a04de7aebafb76 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -34,6 +34,8 @@ LLVM_LIBS = @LLVM_LIBS@
 GLW_CFLAGS = @GLW_CFLAGS@
 GLUT_CFLAGS = @GLUT_CFLAGS@
 
+# dlopen
+DLOPEN_LIBS = @DLOPEN_LIBS@
 
 # Source selection
 MESA_ASM_SOURCES = @MESA_ASM_SOURCES@

diff --git a/configs/default b/configs/default
index 3d9744409ae4a6fbcf6f37150c4fd224b6957fe9..8711a382cc0807f0b11745b6012e2ef4bec72bf8 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -131,6 +131,8 @@ VG_LIB_DEPS    = $(EXTRA_LIB_PATH) -lpthread
 APP_LIB_DEPS = -lm
 X11_LIBS = -lX11
 
+DLOPEN_LIBS = -ldl
+
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
 INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)

diff --git a/configure.ac b/configure.ac
index 1214100a8fddd950f305342b71a2ad8ea3152f30..96195976a0efa29d4a4f9a5da41a1cae14d3c9e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -410,6 +410,7 @@ dnl Check to see if dlopen is in default libraries (like Solaris, which
 dnl has it in libc), or if libdl is needed to get it.
 AC_CHECK_FUNC([dlopen], [],
     [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
 
 dnl See if posix_memalign is available
 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])

diff --git a/src/gallium/targets/egl/Makefile b/src/gallium/targets/egl/Makefile
index f1259a557a185bce1db852e64fe5312ec58bdc50..1e4bb4d94c2d6ae86227b498547ce2f72efc7b50 100644 (file)
--- a/src/gallium/targets/egl/Makefile
+++ b/src/gallium/targets/egl/Makefile
@@ -37,7 +37,7 @@ egl_CPPFLAGS := \
        -I$(TOP)/src/gallium/state_trackers/egl \
        -I$(TOP)/src/egl/main \
        -DPIPE_PREFIX=\"$(PIPE_PREFIX)\" -DST_PREFIX=\"$(ST_PREFIX)\"
-egl_SYS := -lm -ldl -L$(TOP)/$(LIB_DIR) -lEGL
+egl_SYS := -lm $(DLOPEN_LIBS) -L$(TOP)/$(LIB_DIR) -lEGL
 egl_LIBS := $(TOP)/src/gallium/state_trackers/egl/libegl.a
 
 ifneq ($(findstring x11, $(EGL_PLATFORMS)),)