GUAC-707: Fix check for common vs channels (should be non-fatal to RDP). Fix check for freerdp_channels_global_init().
This commit is contained in:
parent
8c1a152467
commit
e687f59834
22
configure.ac
22
configure.ac
@ -326,18 +326,12 @@ AC_CHECK_LIB([freerdp-core], [freerdp_new],
|
|||||||
--------------------------------------------])
|
--------------------------------------------])
|
||||||
have_freerdp=no])
|
have_freerdp=no])
|
||||||
|
|
||||||
# libfreerdp-channels (1.0) / libfreerdp-client (1.1) / libfreerdp-core (1.2+)
|
# libfreerdp-channels (1.0) / libfreerdp-client (1.1)
|
||||||
AC_SEARCH_LIBS([freerdp_channels_new], [freerdp-core freerdp-client],
|
AC_CHECK_LIB([freerdp-client], [freerdp_channels_new],
|
||||||
[RDP_LIBS="$RDP_LIBS -lfreerdp-client"],
|
[RDP_LIBS="$RDP_LIBS -lfreerdp-client"],
|
||||||
[AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new],
|
[AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new],
|
||||||
[RDP_LIBS="$RDP_LIBS -lfreerdp-channels"
|
[RDP_LIBS="$RDP_LIBS -lfreerdp-channels"
|
||||||
legacy_freerdp_extensions=yes],
|
legacy_freerdp_extensions=yes])])
|
||||||
[AC_MSG_WARN([
|
|
||||||
--------------------------------------------
|
|
||||||
Unable to find libfreerdp-client / libfreerdp-channels
|
|
||||||
RDP will be disabled.
|
|
||||||
--------------------------------------------])
|
|
||||||
have_freerdp=no])])
|
|
||||||
|
|
||||||
# libfreerdp-utils
|
# libfreerdp-utils
|
||||||
AC_CHECK_LIB([freerdp-utils], [svc_plugin_init],
|
AC_CHECK_LIB([freerdp-utils], [svc_plugin_init],
|
||||||
@ -394,6 +388,11 @@ AC_CHECK_DECL([freerdp_register_addin_provider],
|
|||||||
[Whether freerdp_register_addin_provider() is defined])],,
|
[Whether freerdp_register_addin_provider() is defined])],,
|
||||||
[#include <freerdp/addin.h>])
|
[#include <freerdp/addin.h>])
|
||||||
|
|
||||||
|
AC_CHECK_DECL([freerdp_channels_global_init],
|
||||||
|
[AC_DEFINE([HAVE_FREERDP_CHANNELS_GLOBAL_INIT],,
|
||||||
|
[Whether freerdp_channels_global_init() is defined])],,
|
||||||
|
[#include <freerdp/channels/channels.h>])
|
||||||
|
|
||||||
#
|
#
|
||||||
# FreeRDP: WinPR
|
# FreeRDP: WinPR
|
||||||
#
|
#
|
||||||
@ -506,11 +505,6 @@ if test "x${rdpsettings_fastpath}" = "xyes"; then
|
|||||||
[Whether the rdpSettings structure has FastPath settings])
|
[Whether the rdpSettings structure has FastPath settings])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if freerdp_channels_global_init exists
|
|
||||||
AC_SEARCH_LIBS([freerdp_channels_global_init], [freerdp-channels],
|
|
||||||
[AC_DEFINE([HAVE_FREERDP_CHANNELS_GLOBAL_INIT],,
|
|
||||||
[Wheter the freerdp_channels_global_init() is defined])],,)
|
|
||||||
|
|
||||||
# Check if the type CHANNEL_ENTRY_POINTS_FREERDP exists, if not define it to CHANNEL_ENTRY_POINTS_EX
|
# Check if the type CHANNEL_ENTRY_POINTS_FREERDP exists, if not define it to CHANNEL_ENTRY_POINTS_EX
|
||||||
AC_CHECK_TYPE([CHANNEL_ENTRY_POINTS_FREERDP],,
|
AC_CHECK_TYPE([CHANNEL_ENTRY_POINTS_FREERDP],,
|
||||||
AC_DEFINE([CHANNEL_ENTRY_POINTS_FREERDP],[CHANNEL_ENTRY_POINTS_EX], [Type compatibility]),
|
AC_DEFINE([CHANNEL_ENTRY_POINTS_FREERDP],[CHANNEL_ENTRY_POINTS_EX], [Type compatibility]),
|
||||||
|
Loading…
Reference in New Issue
Block a user