|
@@ -20111,8 +20111,34 @@ else
|
|
|
$as_echo_n "(cached) " >&6
|
|
|
else
|
|
|
# One or both of the vars are not set, and there is no cached value.
|
|
|
-ac_x_includes=no ac_x_libraries=no
|
|
|
-rm -f -r conftest.dir
|
|
|
+ac_x_includes=no
|
|
|
+ac_x_libraries=no
|
|
|
+# Do we need to do anything special at all?
|
|
|
+ac_save_LIBS=$LIBS
|
|
|
+LIBS="-lX11 $LIBS"
|
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+/* end confdefs.h. */
|
|
|
+#include <X11/Xlib.h>
|
|
|
+int
|
|
|
+main ()
|
|
|
+{
|
|
|
+XrmInitialize ()
|
|
|
+ ;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+_ACEOF
|
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
+ # We can compile and link X programs with no special options.
|
|
|
+ ac_x_includes=
|
|
|
+ ac_x_libraries=
|
|
|
+fi
|
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
+LIBS="$ac_save_LIBS"
|
|
|
+# If that didn't work, only try xmkmf and filesystem searches
|
|
|
+# for native compilation.
|
|
|
+if test x"$ac_x_includes" = xno && test "$cross_compiling" = no; then :
|
|
|
+ rm -f -r conftest.dir
|
|
|
if mkdir conftest.dir; then
|
|
|
cd conftest.dir
|
|
|
cat >Imakefile <<'_ACEOF'
|
|
@@ -20151,7 +20177,7 @@ _ACEOF
|
|
|
rm -f -r conftest.dir
|
|
|
fi
|
|
|
|
|
|
-# Standard set of common directories for X headers.
|
|
|
+ # Standard set of common directories for X headers.
|
|
|
# Check X11 before X11Rn because it is often a symlink to the current release.
|
|
|
ac_x_header_dirs='
|
|
|
/usr/X11/include
|
|
@@ -20253,15 +20279,17 @@ rm -f core conftest.err conftest.$ac_objext \
|
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
|
fi # $ac_x_libraries = no
|
|
|
|
|
|
+fi
|
|
|
+# Record the results.
|
|
|
case $ac_x_includes,$ac_x_libraries in #(
|
|
|
- no,* | *,no | *\'*)
|
|
|
+ no,* | *,no | *\'*) :
|
|
|
# Didn't find X, or a directory has "'" in its name.
|
|
|
- ac_cv_have_x="have_x=no";; #(
|
|
|
- *)
|
|
|
+ ac_cv_have_x="have_x=no" ;; #(
|
|
|
+ *) :
|
|
|
# Record where we found X for the cache.
|
|
|
ac_cv_have_x="have_x=yes\
|
|
|
ac_x_includes='$ac_x_includes'\
|
|
|
- ac_x_libraries='$ac_x_libraries'"
|
|
|
+ ac_x_libraries='$ac_x_libraries'" ;;
|
|
|
esac
|
|
|
fi
|
|
|
;; #(
|
|
@@ -21962,7 +21990,10 @@ else
|
|
|
fi
|
|
|
|
|
|
|
|
|
- if test x$enable_video = xyes -a x$enable_video_kmsdrm = xyes; then
|
|
|
+ if test x$enable_video = xyes && \
|
|
|
+ test x$enable_video_kmsdrm = xyes && \
|
|
|
+ test x$video_opengl_egl = xyes; then
|
|
|
+
|
|
|
video_kmsdrm=no
|
|
|
|
|
|
|
|
@@ -22400,6 +22431,45 @@ $as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
+CheckEGLKMSDRM()
|
|
|
+{
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGL support" >&5
|
|
|
+$as_echo_n "checking for EGL support... " >&6; }
|
|
|
+ video_opengl_egl=no
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
+/* end confdefs.h. */
|
|
|
+
|
|
|
+ #define LINUX
|
|
|
+ #define EGL_API_FB
|
|
|
+ #define MESA_EGL_NO_X11_HEADERS
|
|
|
+ #define EGL_NO_X11
|
|
|
+ #include <EGL/egl.h>
|
|
|
+ #include <EGL/eglext.h>
|
|
|
+
|
|
|
+int
|
|
|
+main ()
|
|
|
+{
|
|
|
+
|
|
|
+
|
|
|
+ ;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+_ACEOF
|
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
+
|
|
|
+ video_opengl_egl=yes
|
|
|
+
|
|
|
+fi
|
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengl_egl" >&5
|
|
|
+$as_echo "$video_opengl_egl" >&6; }
|
|
|
+ if test x$video_opengl_egl = xyes; then
|
|
|
+
|
|
|
+$as_echo "#define SDL_VIDEO_OPENGL_EGL 1" >>confdefs.h
|
|
|
+
|
|
|
+ fi
|
|
|
+}
|
|
|
+
|
|
|
CheckWINDOWSGL()
|
|
|
{
|
|
|
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
|
|
@@ -24751,6 +24821,8 @@ $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
|
|
|
CheckRPI
|
|
|
CheckX11
|
|
|
CheckDirectFB
|
|
|
+ # Need to check for EGL first because KMSDRM depends on it.
|
|
|
+ CheckEGLKMSDRM
|
|
|
CheckKMSDRM
|
|
|
CheckOpenGLX11
|
|
|
CheckOpenGLESX11
|