Commit 15ed665363b192c29f733d54d46e9669256760fd
2021-07-22T20:50:02
Fixes to kmsdrm dynamic loading support. Fixes: https://github.com/libsdl-org/SDL/issues/4520
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/configure b/configure
index be32733..fe4bd0f 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 b937115..1dcb00f 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