encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac: directfb dynamic loading support updates: 

put back sed on find_lib result, remove debug messages,
fix directfb_lib report to user.
This commit is contained in:
Ozkan Sezer 2020-12-30 15:55:00 +03:00
parent f24cc903a2
commit a88071deb5
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -21960,13 +21960,8 @@ $as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for directfb dynamic loading support" >&5
$as_echo_n "checking for directfb dynamic loading support... " >&6; }
directfb_shared=no directfb_shared=no
directfb_lib=`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS"` directfb_lib=`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`
# | sed 's/.*\/\(.*\)/\1/; q'`]
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"directfb $directfb_lib\"" >&5
$as_echo "$as_me: WARNING: \"directfb $directfb_lib\"" >&2;}
if test x$have_loadso != xyes && \ if test x$have_loadso != xyes && \
test x$enable_directfb_shared = xyes; then test x$enable_directfb_shared = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic directfb loading" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic directfb loading" >&5
@ -21975,7 +21970,7 @@ $as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic di
if test x$have_loadso = xyes && \ if test x$have_loadso = xyes && \
test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then
directfb_shared=yes directfb_shared=yes
echo "-- $directfb_lib_spec -> $directfb_lib" echo "-- dynamic libdirectfb -> $directfb_lib"
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC "$directfb_lib" #define SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC "$directfb_lib"
@ -21986,8 +21981,6 @@ _ACEOF
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
SUMMARY_video="${SUMMARY_video} directfb" SUMMARY_video="${SUMMARY_video} directfb"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $directfb_shared" >&5
$as_echo "$directfb_shared" >&6; }
SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS" SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS"
have_video=yes have_video=yes
fi fi

8
configure.ac
View File

@ -2203,11 +2203,8 @@ AS_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
AC_MSG_CHECKING(for directfb dynamic loading support)
directfb_shared=no directfb_shared=no
directfb_lib=[`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS"`] directfb_lib=[`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
# | sed 's/.*\/\(.*\)/\1/; q'`]
AC_MSG_WARN("directfb $directfb_lib")
if test x$have_loadso != xyes && \ if test x$have_loadso != xyes && \
test x$enable_directfb_shared = xyes; then test x$enable_directfb_shared = xyes; then
AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic directfb loading]) AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic directfb loading])
@ -2215,14 +2212,13 @@ AC_MSG_WARN("directfb $directfb_lib")
if test x$have_loadso = xyes && \ if test x$have_loadso = xyes && \
test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then
directfb_shared=yes directfb_shared=yes
echo "-- $directfb_lib_spec -> $directfb_lib" echo "-- dynamic libdirectfb -> $directfb_lib"
AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC, "$directfb_lib", [ ]) AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC, "$directfb_lib", [ ])
SUMMARY_video="${SUMMARY_video} directfb(dynamic)" SUMMARY_video="${SUMMARY_video} directfb(dynamic)"
else else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
SUMMARY_video="${SUMMARY_video} directfb" SUMMARY_video="${SUMMARY_video} directfb"
fi fi
AC_MSG_RESULT($directfb_shared)
SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS" SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS"
have_video=yes have_video=yes
fi fi