[virglrenderer-devel] [PATCH 2/4] configure.ac: Set HAVE_EPOXY_GLX_H correctly

[Gert Wollny]

Am Donnerstag, den 14.06.2018, 12:51 +1000 schrieb Dave Airlie:
> On 13 June 2018 at 19:03, Gert Wollny <gert.wollny at collabora.com>
> wrote:
> > The define HAVE_EPOXY_GLX_H is used in the source code, but never
> > actually
> > defined. Use the same check like for egl to test for GLX support in
> > EPOXY
> > and set the define accordingly in config.h.
> > 
> > Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
> > ---
> >  configure.ac | 11 ++++++-----
> >  1 file changed, 6 insertions(+), 5 deletions(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 0acbccb..8b146cb 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -126,17 +126,18 @@ if test "x$os_win32" = xno; then
> >         ])
> >  fi
> > 
> > -
> > -AM_CONDITIONAL([HAVE_EPOXY_EGL], [test "x$epoxy_has_egl" =
> > "xyes"])
> 
> Why drop the automake conditional here? don't we need this in
> src/Makefile.am  to build the egl bits?
> 
It's a duplicate, line 120 contains the same statement (should have
added this to the commit message, sorry). 

Best, 
Gert 


> Dave.
> 
> > -
> >  AC_ARG_WITH([glx], AS_HELP_STRING([--with-glx], [Build with the
> > x11/glx backend]))
> >  AS_IF([test "x$with_glx" = "xyes"], [
> >    PKG_CHECK_MODULES([X11], [x11])
> > -  AC_CHECK_HEADER([epoxy/glx.h])
> > +  PKG_CHECK_VAR(epoxy_has_glx, [epoxy], [epoxy_has_glx])
> > +  AS_IF([test "x$epoxy_has_glx" = "x1"], [
> > +    AC_DEFINE([HAVE_EPOXY_GLX_H], [1], [Libepoxy has GLX
> > support.])
> > +  ],[
> > +    with_glx=no
> > +  ])
> >  ])
> >  AM_CONDITIONAL([WITH_GLX], [test "x$with_glx" = "xyes"])
> > 
> > -
> >  AC_SUBST([DEFINES])
> >  AC_CONFIG_FILES([
> >                 virglrenderer.pc
> > --
> > 2.17.1
> > 
> > _______________________________________________
> > virglrenderer-devel mailing list
> > virglrenderer-devel at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/virglrenderer-devel
> 
> _______________________________________________
> virglrenderer-devel mailing list
> virglrenderer-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/virglrenderer-devel