diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2016-05-30 16:35:40 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-30 17:53:34 +0100 |
| commit | f9a35bf0125516d9cc660818e7ae2e9dc204b9c5 (patch) | |
| tree | bf3e2da1636bd7df043a241876334e846557a2ed | |
| parent | 22a9e00aab66d3dd6890e9eaac3f429c0ddec17e (diff) | |
configure.ac: correct the xlib/xlib-gallium GLX detection for GLVND
Things have changed since commit a92910a ("glx: Refactor the configure
options for glx implementation choice (v3)") where only a single
configure option is used to control the GLX provider.
[Emil Velikov: Ensure that the check is moved after the detection code.]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | configure.ac | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 35fe99a017..173d6df3a4 100644 --- a/configure.ac +++ b/configure.ac @@ -531,32 +531,6 @@ fi DEFAULT_GL_LIB_NAME=GL dnl -dnl Libglvnd configuration -dnl -AC_ARG_ENABLE([libglvnd], - [AS_HELP_STRING([--enable-libglvnd], - [Build for libglvnd @<:@default=disabled@:>@])], - [enable_libglvnd="$enableval"], - [enable_libglvnd=no]) -AM_CONDITIONAL(USE_LIBGLVND_GLX, test "x$enable_libglvnd" = xyes) -if test "x$enable_libglvnd" = xyes ; then - dnl XXX: update once we can handle more than libGL/glx. - dnl Namely: we should error out if neither of the glvnd enabled libraries - dnl are built - if test "x$enable_glx" = xno; then - AC_MSG_ERROR([cannot build libglvnd without GLX]) - fi - - if test "x$enable_xlib_glx" = xyes; then - AC_MSG_ERROR([cannot build libgvnd when Xlib-GLX is enabled]) - fi - - PKG_CHECK_MODULES([GLVND], libglvnd >= 0.1.0) - DEFINES="${DEFINES} -DUSE_LIBGLVND_GLX=1" - DEFAULT_GL_LIB_NAME=GLX_mesa -fi - -dnl dnl Check if linker supports -Bsymbolic dnl save_LDFLAGS=$LDFLAGS @@ -1097,6 +1071,35 @@ AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xdri) AM_CONDITIONAL(HAVE_XLIB_GLX, test "x$enable_glx" = xxlib) AM_CONDITIONAL(HAVE_GALLIUM_XLIB_GLX, test "x$enable_glx" = xgallium-xlib) +dnl +dnl Libglvnd configuration +dnl +AC_ARG_ENABLE([libglvnd], + [AS_HELP_STRING([--enable-libglvnd], + [Build for libglvnd @<:@default=disabled@:>@])], + [enable_libglvnd="$enableval"], + [enable_libglvnd=no]) +AM_CONDITIONAL(USE_LIBGLVND_GLX, test "x$enable_libglvnd" = xyes) +if test "x$enable_libglvnd" = xyes ; then + dnl XXX: update once we can handle more than libGL/glx. + dnl Namely: we should error out if neither of the glvnd enabled libraries + dnl are built + case "x$enable_glx" in + xno) + AC_MSG_ERROR([cannot build libglvnd without GLX]) + ;; + xxlib | xgallium-xlib ) + AC_MSG_ERROR([cannot build libgvnd when Xlib-GLX or Gallium-Xlib-GLX is enabled]) + ;; + xdri) + ;; + esac + + PKG_CHECK_MODULES([GLVND], libglvnd >= 0.1.0) + DEFINES="${DEFINES} -DUSE_LIBGLVND_GLX=1" + DEFAULT_GL_LIB_NAME=GLX_mesa +fi + # Check for libdrm PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED], [have_libdrm=yes], [have_libdrm=no]) |