From c0c7d45e92d0886821822450961f130e3f366b8c Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Sun, 10 May 2020 15:13:16 +0100 Subject: build: Replace bashisms in configure for Wayland and GLES3 checking for wayland-scanner... wayland-scanner ./configure: 28389: test: xyes: unexpected operator checking libdrm/drm_fourcc.h usability... yes checking libdrm/drm_fourcc.h presence... yes checking for libdrm/drm_fourcc.h... yes checking for glTexDirectVIV in -lGLESv2... no ./configure: 28530: test: xyes: unexpected operator ./configure: 28533: test: x: unexpected operator Causes build failure: make[6]: *** No rule to make target '/stable/xdg-shell/xdg-shell.xml', needed by 'xdg-shell-client-protocol.c'. Stop. --- m4/gst-gl.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 index a397757eb..633d98a4e 100644 --- a/m4/gst-gl.m4 +++ b/m4/gst-gl.m4 @@ -179,7 +179,7 @@ case $host in AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h) fi AC_CHECK_HEADER([GLES3/gl3.h], [HAVE_GLES3_H=yes]) - AS_IF([test "x$HAVE_GLES3_H" == "xyes"], + AS_IF([test "x$HAVE_GLES3_H" = "xyes"], [ AC_CHECK_HEADER([GLES3/gl3ext.h], [HAVE_GLES3EXT3_H=yes], [HAVE_GLES3EXT3_H=no], [#include ]) ]) @@ -290,8 +290,8 @@ case $host in PKG_CHECK_MODULES(WAYLAND_EGL, wayland-client >= 1.0 wayland-cursor >= 1.0 wayland-egl >= 9.0 wayland-protocols >= 1.15, HAVE_WAYLAND_EGL=yes, HAVE_WAYLAND_EGL=no) AC_CHECK_PROGS(WAYLAND_SCANNER, wayland-scanner) - if test x"$HAVE_WAYLAND_EGL" == xyes ; then - if test x"$WAYLAND_SCANNER" == x ; then + if test "x$HAVE_WAYLAND_EGL" = "xyes" ; then + if test "x$WAYLAND_SCANNER" = "x" ; then AC_MSG_ERROR([Found Wayland libraries, but couldn't find wayland-scanner binary.]) fi @@ -391,10 +391,10 @@ dnl check if we can include both GL and GLES2 at the same time if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then GLES3_H_DEFINE=0 GLES3EXT3_H_DEFINE=0 - if test "x$HAVE_GLES3_H" == "xyes"; then + if test "x$HAVE_GLES3_H" = "xyes"; then GLES3_H_DEFINE=1 fi - if test "x$HAVE_GLES3EXT3_H" == "xyes"; then + if test "x$HAVE_GLES3EXT3_H" = "xyes"; then GLES3EXT3_H_DEFINE=1 fi GL_INCLUDES=" -- cgit v1.2.1