diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-11-12 01:13:01 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-12 01:30:08 +0200 |
| commit | b216cc1b8096eb60c27f67e8c27b7cd756c75e38 (patch) | |
| tree | 261cc276957765f88dc0d618e90a7608bbaae166 /configure.ac | |
| parent | 318c3a48c66dd4ceba801ef410f89b8bf900d5c7 (diff) | |
Avoid mesa_headers on X11, also link with -lGL only where necesssary
The GLEW headers are enough, and what we actually use in these
places. In addition to handling GL extension things in its dynamic
fashion, GLEW headers also have declarations for standard,
non-extension, OpenGL API, including xgl and wgl ones.
Most likely we don't need mesa_headers on Windows or OS X either, and
can drop them completely.
Change-Id: Ic0d8d6238c862f8fe4a74e99e95344dcbf540980
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 6bdf28d54459..31cc1d9bcb9e 100644 --- a/configure.ac +++ b/configure.ac @@ -10410,23 +10410,25 @@ else fi ENABLE_OPENGL_CANVAS=TRUE - dnl =================================================================== - dnl Check for system Mesa - dnl =================================================================== - AC_MSG_CHECKING([which Mesa headers to use]) - if test "$with_system_mesa_headers" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_MESA_HEADERS=TRUE - AC_LANG_PUSH(C) - AC_CHECK_HEADER(GL/glxext.h, [], - [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>]) - AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC]) - AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no)) - AC_LANG_POP(C) - else - AC_MSG_RESULT([internal]) - SYSTEM_MESA_HEADERS= - BUILD_TYPE="$BUILD_TYPE MESA" + if test "$USING_X11" != TRUE; then + dnl =================================================================== + dnl Check for system Mesa + dnl =================================================================== + AC_MSG_CHECKING([which Mesa headers to use]) + if test "$with_system_mesa_headers" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_MESA_HEADERS=TRUE + AC_LANG_PUSH(C) + AC_CHECK_HEADER(GL/glxext.h, [], + [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>]) + AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC]) + AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no)) + AC_LANG_POP(C) + else + AC_MSG_RESULT([internal]) + SYSTEM_MESA_HEADERS= + BUILD_TYPE="$BUILD_TYPE MESA" + fi fi fi |