Skip to content

Commit

Permalink
autotools: check for dlvsym
Browse files Browse the repository at this point in the history
As per the previous commit, instead of assuming that Apple doesn't have dlvsym
but everywhere else does, actually check for dlvsym() existing as that function
is glibc-specific.
  • Loading branch information
rossburton committed Mar 12, 2018
1 parent 1267f82 commit f9098b0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ AS_CASE([$host_os],

[darwin*], [
build_wgl=no
build_apple=yes
has_znow=no
EPOXY_LINK_LIBS=""
],
Expand Down Expand Up @@ -177,11 +176,6 @@ if test x$build_wgl = xyes; then
AC_DEFINE([BUILD_WGL], [1], [build WGL tests])
fi

AM_CONDITIONAL(BUILD_APPLE, test x$build_apple = xyes)
if test x$build_apple = xyes; then
AC_DEFINE([BUILD_APPLE], [1], [build APPLE is apple (for testing)])
fi

AM_CONDITIONAL(HAS_ZNOW, test x$has_znow = xyes)

AC_CHECK_LIB([GLESv1_CM], [glFlush], [has_gles1=yes], [has_gles1=no])
Expand All @@ -190,6 +184,12 @@ AM_CONDITIONAL(HAS_GLES1, test x$has_gles1 = xyes)
AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])
AC_SUBST([DLOPEN_LIBS])

savelibs=$LIBS
LIBS=$DLOPEN_LIBS
AC_CHECK_FUNCS([dlvsym], [have_dlvsym=1], [have_dlvsym=0])
AM_CONDITIONAL(HAVE_DLVSYM, test $have_dlvsym = 1)
LIBS=$savelibs

VISIBILITY_CFLAGS=""
AS_CASE(["$host"],

Expand Down
Empty file modified src/gen_dispatch.py
100644 → 100755
Empty file.
8 changes: 4 additions & 4 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ endif

if BUILD_EGL
if BUILD_GLX
if !BUILD_APPLE
if HAVE_DLVSYM
EGL_AND_GLX_TESTS = \
egl_gl \
egl_and_glx_different_pointers_egl_glx \
Expand All @@ -107,8 +107,8 @@ endif
endif
endif

if !BUILD_APPLE
GLX_NON_APPLE_TESTS = \
if HAVE_DLVSYM
GLX_DLVSYM_TESTS = \
glx_alias_prefer_same_name \
glx_gles2 \
$()
Expand All @@ -122,7 +122,7 @@ GLX_TESTS = \
glx_has_extension_nocontext \
glx_static \
$(GLX_SHARED_ZNOW) \
$(GLX_NON_APPLE_TESTS) \
$(GLX_DLVSYM_TESTS) \
$()

GLX_UTIL_LIB = libglx_common.la
Expand Down

0 comments on commit f9098b0

Please # to comment.