configure: Make sure to try window-system-agnostic EGL if nothing was auto-detected

This commit is contained in:
Sebastian Dröge 2013-10-08 11:10:49 +02:00
parent 0d54e5857f
commit f16e70e4ca

View file

@ -489,12 +489,12 @@ if test x"$EGL_WINDOW_SYSTEM" = x"auto"; then
fi fi
if test x"$EGL_WINDOW_SYSTEM" = x"auto"; then if test x"$EGL_WINDOW_SYSTEM" = x"auto"; then
EGL_WINDOW_SYSTEM="none" EGL_WINDOW_SYSTEM="auto"
fi fi
fi fi
case "$EGL_WINDOW_SYSTEM" in case "$EGL_WINDOW_SYSTEM" in
x11) x11|auto)
PKG_CHECK_MODULES(EGL, egl, HAVE_EGL="yes", [ PKG_CHECK_MODULES(EGL, egl, HAVE_EGL="yes", [
HAVE_EGL="no" HAVE_EGL="no"
old_LIBS=$LIBS old_LIBS=$LIBS
@ -516,6 +516,7 @@ case "$EGL_WINDOW_SYSTEM" in
CFLAGS=$old_CFLAGS CFLAGS=$old_CFLAGS
]) ])
dnl X11 specific part, above is auto and X11
if test x"$HAVE_EGL" = x"yes" -a x"$EGL_WINDOW_SYSTEM" = x"x11"; then if test x"$HAVE_EGL" = x"yes" -a x"$EGL_WINDOW_SYSTEM" = x"x11"; then
if test x"$HAVE_X11" != x"yes"; then if test x"$HAVE_X11" != x"yes"; then
AC_MSG_ERROR([libX11 not found and is required for EGL X11 window system]) AC_MSG_ERROR([libX11 not found and is required for EGL X11 window system])