On Thu, 2017-01-19 at 15:19 +0000, Emil Velikov wrote: > From: Emil Velikov <emil.veli...@collabora.com> > > Otherwise we'll get a lovely message as below: > "require_dri_shared_libs_and_glapi: command not found" > > Cc: Steven Newbury <st...@snewbury.org.uk> > Reported-by: Steven Newbury <st...@snewbury.org.uk> > Fixes: da410e6afad "configure: explicitly require shared glapi for > enable-dri" > Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> > --- > configure.ac | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) > > diff --git a/configure.ac b/configure.ac > index de8af874ec..64ace9dbcb 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1436,6 +1436,22 @@ if test "x$enable_gallium_osmesa" = xyes; then > fi > fi > > +require_dri_shared_libs_and_glapi() { > + if test "x$enable_static" = xyes; then > + AC_MSG_ERROR([$1 cannot be build as static library]) > + fi > + > + if test "x$enable_dri" != xyes; then > + # There is only a single backend which won't be build/used > otherwise. > + # XXX: Revisit this as the egl/haiku is a thing. > + AC_MSG_ERROR([$1 requires --enable-dri]) > + fi > + > + if test "x$enable_shared_glapi" != xyes; then > + AC_MSG_ERROR([$1 requires --enable-shared-glapi]) > + fi > +} > + > if test "x$enable_dri" = xyes; then > require_dri_shared_libs_and_glapi "DRI" > > @@ -1815,22 +1831,6 @@ AC_SUBST([OSMESA_LIB_DEPS]) > AC_SUBST([OSMESA_PC_REQ]) > AC_SUBST([OSMESA_PC_LIB_PRIV]) > > -require_dri_shared_libs_and_glapi() { > - if test "x$enable_static" = xyes; then > - AC_MSG_ERROR([$1 cannot be build as static library]) > - fi > - > - if test "x$enable_dri" != xyes; then > - # There is only a single backend which won't be build/used > otherwise. > - # XXX: Revisit this as the egl/haiku is a thing. > - AC_MSG_ERROR([$1 requires --enable-dri]) > - fi > - > - if test "x$enable_shared_glapi" != xyes; then > - AC_MSG_ERROR([$1 requires --enable-shared-glapi]) > - fi > -} > - > dnl > dnl gbm configuration > dnl
That's better! :-) Tested-by: Steven Newbury <st...@snewbury.org.uk>
signature.asc
Description: This is a digitally signed message part
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev