From 15ed665363b192c29f733d54d46e9669256760fd Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Thu, 22 Jul 2021 20:50:02 +0300 Subject: [PATCH] Fixes to kmsdrm dynamic loading support. Fixes: https://github.com/libsdl-org/SDL/issues/4520 --- configure | 8 ++++++-- configure.ac | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure b/configure index be3273389..fe4bd0f62 100755 --- a/configure +++ b/configure @@ -22240,8 +22240,8 @@ $as_echo "#define SDL_VIDEO_DRIVER_KMSDRM 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kmsdrm dynamic loading support" >&5 $as_echo_n "checking for kmsdrm dynamic loading support... " >&6; } kmsdrm_shared=no - drm_lib=`find_lib "libdrm.so.*" "$DRM_LIBS"` - gbm_lib=`find_lib "libgbm.so.*" "$DRM_LIBS"` + drm_lib=`find_lib "libdrm.so.*" "$LIBDRM_LIBS"` + gbm_lib=`find_lib "libgbm.so.*" "$LIBGBM_LIBS"` if test x$have_loadso != xyes && \ test x$enable_kmsdrm_shared = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic kmsdrm loading" >&5 @@ -22272,6 +22272,10 @@ _ACEOF fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kmsdrm_shared" >&5 $as_echo "$kmsdrm_shared" >&6; } + if test x$kmsdrm_shared = xyes; then + echo "-- dynamic libdrm -> $drm_lib" + echo "-- dynamic libgmb -> $gbm_lib" + fi have_video=yes fi fi diff --git a/configure.ac b/configure.ac index b93711538..1dcb00f5e 100644 --- a/configure.ac +++ b/configure.ac @@ -2222,8 +2222,8 @@ CheckKMSDRM() AC_MSG_CHECKING(for kmsdrm dynamic loading support) kmsdrm_shared=no - drm_lib=[`find_lib "libdrm.so.*" "$DRM_LIBS"`] - gbm_lib=[`find_lib "libgbm.so.*" "$DRM_LIBS"`] + drm_lib=[`find_lib "libdrm.so.*" "$LIBDRM_LIBS"`] + gbm_lib=[`find_lib "libgbm.so.*" "$LIBGBM_LIBS"`] if test x$have_loadso != xyes && \ test x$enable_kmsdrm_shared = xyes; then AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic kmsdrm loading]) @@ -2240,6 +2240,10 @@ CheckKMSDRM() SUMMARY_video="${SUMMARY_video} kmsdrm" fi AC_MSG_RESULT($kmsdrm_shared) + if test x$kmsdrm_shared = xyes; then + echo "-- dynamic libdrm -> $drm_lib" + echo "-- dynamic libgmb -> $gbm_lib" + fi have_video=yes fi fi