GUAC-852: Make checks for FreeRDP libs non-fatal. Additionally check for libfrerdp + libfreerdp-client (replaces libfreerdp-core on master).
This commit is contained in:
parent
f18d9ae831
commit
450db1657e
34
configure.ac
34
configure.ac
@ -378,15 +378,17 @@ then
|
|||||||
freerdp_interface=unknown
|
freerdp_interface=unknown
|
||||||
event_interface=unknown
|
event_interface=unknown
|
||||||
|
|
||||||
# libfreerdp-core
|
# libfreerdp-core / libfreerdp
|
||||||
AC_CHECK_LIB([freerdp-core], [freerdp_new],
|
AC_CHECK_LIB([freerdp-core], [freerdp_new],
|
||||||
[RDP_LIBS="$RDP_LIBS -lfreerdp-core"],
|
[RDP_LIBS="$RDP_LIBS -lfreerdp-core"],
|
||||||
[AC_MSG_WARN([
|
[AC_CHECK_LIB([freerdp], [freerdp_new],
|
||||||
|
[RDP_LIBS="$RDP_LIBS -lfreerdp -lfreerdp-client"],
|
||||||
|
[AC_MSG_WARN([
|
||||||
--------------------------------------------
|
--------------------------------------------
|
||||||
Unable to find libfreerdp-core
|
Unable to find libfreerdp-core / libfreerdp
|
||||||
RDP will be disabled.
|
RDP will be disabled.
|
||||||
--------------------------------------------])
|
--------------------------------------------])
|
||||||
have_freerdp=no])
|
have_freerdp=no])])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -394,13 +396,7 @@ fi
|
|||||||
if test "x${have_freerdp}" = "xyes"
|
if test "x${have_freerdp}" = "xyes"
|
||||||
then
|
then
|
||||||
AC_CHECK_LIB([freerdp-cache], [glyph_cache_register_callbacks],
|
AC_CHECK_LIB([freerdp-cache], [glyph_cache_register_callbacks],
|
||||||
[RDP_LIBS="$RDP_LIBS -lfreerdp-cache"],
|
[RDP_LIBS="$RDP_LIBS -lfreerdp-cache"])
|
||||||
[AC_MSG_WARN([
|
|
||||||
--------------------------------------------
|
|
||||||
Unable to find libfreerdp-cache
|
|
||||||
RDP will be disabled.
|
|
||||||
--------------------------------------------])
|
|
||||||
have_freerdp=no])
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# libfreerdp-channels (1.0) / libfreerdp-client (1.1)
|
# libfreerdp-channels (1.0) / libfreerdp-client (1.1)
|
||||||
@ -417,26 +413,14 @@ fi
|
|||||||
if test "x${have_freerdp}" = "xyes"
|
if test "x${have_freerdp}" = "xyes"
|
||||||
then
|
then
|
||||||
AC_CHECK_LIB([freerdp-utils], [svc_plugin_init],
|
AC_CHECK_LIB([freerdp-utils], [svc_plugin_init],
|
||||||
[RDP_LIBS="$RDP_LIBS -lfreerdp-utils"],
|
[RDP_LIBS="$RDP_LIBS -lfreerdp-utils"])
|
||||||
[AC_MSG_WARN([
|
|
||||||
--------------------------------------------
|
|
||||||
Unable to find libfreerdp-utils
|
|
||||||
RDP will be disabled.
|
|
||||||
--------------------------------------------])
|
|
||||||
have_freerdp=no])
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# libfreerdp-codec
|
# libfreerdp-codec
|
||||||
if test "x${have_freerdp}" = "xyes"
|
if test "x${have_freerdp}" = "xyes"
|
||||||
then
|
then
|
||||||
AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert],
|
AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert],
|
||||||
[RDP_LIBS="$RDP_LIBS -lfreerdp-codec"],
|
[RDP_LIBS="$RDP_LIBS -lfreerdp-codec"])
|
||||||
[AC_MSG_WARN([
|
|
||||||
--------------------------------------------
|
|
||||||
Unable to find libfreerdp-codec
|
|
||||||
RDP will be disabled.
|
|
||||||
--------------------------------------------])
|
|
||||||
have_freerdp=no])
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for interval polling in plugins
|
# Check for interval polling in plugins
|
||||||
|
Loading…
Reference in New Issue
Block a user