[Mesa-dev] mesa: don't install GLX files if GLX is not built

[Emil Velikov]

Hi Akihiko Odaki,

Thanks for the patch. I have a question below

On 26 June 2016 at 02:54, Akihiko Odaki
<akihiko.odaki.4i at stu.hosei.ac.jp> wrote:
> Signed-off-by: Akihiko Odaki <akihiko.odaki.4i at stu.hosei.ac.jp>
>
> diff --git a/configure.ac b/configure.ac
> index cc9bc47..320781a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1060,6 +1060,7 @@ xno)
>      ;;
>  esac
>
> +AM_CONDITIONAL(HAVE_GLX, test "x$enable_glx" != xno)
>  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)
> diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
> index 6d7a3cc..037384a 100644
> --- a/src/mesa/Makefile.am
> +++ b/src/mesa/Makefile.am
> @@ -33,8 +33,10 @@ if HAVE_OSMESA
>  SUBDIRS += drivers/osmesa
>  endif
>
> +if HAVE_GLX
>  gldir = $(includedir)/GL
>  gl_HEADERS = $(top_srcdir)/include/GL/*.h
> +endif
>
>  include Makefile.sources
>
> @@ -159,8 +161,10 @@ libmesa_sse41_la_SOURCES = \
>
>  libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
>
> +if HAVE_GLX
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = gl.pc
> +endif
>
>  MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
>  YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS)
> diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
> index 1c6dd08..6d99b2c 100644
> --- a/src/mesa/drivers/dri/Makefile.am
> +++ b/src/mesa/drivers/dri/Makefile.am
> @@ -52,9 +52,11 @@ endif
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = dri.pc
>
> +if HAVE_GLX
>  driincludedir = $(includedir)/GL/internal
>  driinclude_HEADERS = \
>         $(top_srcdir)/include/GL/internal/dri_interface.h
> +endif
>
While dri_interface.h is located under GL it isn't restricted to GLX
Every DRI loader (libEGL, libgbm, libGL and xserver's libglx)
depends/uses it. That said, do you mind if we drop this hunk from the
patch ?

Regards,
Emil