Commit a88071deb5ced3e1a0f1818c3e64d6f7e8b47e23
2020-12-30T15:55:00
configure.ac: directfb dynamic loading support updates: put back sed on find_lib result, remove debug messages, fix directfb_lib report to user.
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 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/configure b/configure
index ffa73a5..40f191f 100755
--- a/configure
+++ b/configure
@@ -21960,13 +21960,8 @@ $as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
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_lib=`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS"`
- # | 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;}
+ directfb_lib=`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`
if test x$have_loadso != xyes && \
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
@@ -21975,7 +21970,7 @@ $as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic di
if test x$have_loadso = xyes && \
test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then
directfb_shared=yes
- echo "-- $directfb_lib_spec -> $directfb_lib"
+ echo "-- dynamic libdirectfb -> $directfb_lib"
cat >>confdefs.h <<_ACEOF
#define SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC "$directfb_lib"
@@ -21986,8 +21981,6 @@ _ACEOF
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
SUMMARY_video="${SUMMARY_video} directfb"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $directfb_shared" >&5
-$as_echo "$directfb_shared" >&6; }
SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS"
have_video=yes
fi
diff --git a/configure.ac b/configure.ac
index 387e73e..1e42d51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2203,11 +2203,8 @@ AS_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
- AC_MSG_CHECKING(for directfb dynamic loading support)
directfb_shared=no
- directfb_lib=[`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS"`]
- # | sed 's/.*\/\(.*\)/\1/; q'`]
-AC_MSG_WARN("directfb $directfb_lib")
+ directfb_lib=[`find_lib "libdirectfb*.so.*" "$DIRECTFB_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
if test x$have_loadso != xyes && \
test x$enable_directfb_shared = xyes; then
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 && \
test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then
directfb_shared=yes
- echo "-- $directfb_lib_spec -> $directfb_lib"
+ echo "-- dynamic libdirectfb -> $directfb_lib"
AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC, "$directfb_lib", [ ])
SUMMARY_video="${SUMMARY_video} directfb(dynamic)"
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
SUMMARY_video="${SUMMARY_video} directfb"
fi
- AC_MSG_RESULT($directfb_shared)
SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS"
have_video=yes
fi