Merge pull request #27 from glyptodon/freerdp-dso-compat

GUAC-1005: Include libfreerdp-core in test for freerdp_channels_new()
This commit is contained in:
James Muehlner 2015-02-09 17:32:20 -08:00
commit b92d2baa91

View File

@ -400,14 +400,15 @@ then
[RDP_LIBS="$RDP_LIBS -lfreerdp-cache"]) [RDP_LIBS="$RDP_LIBS -lfreerdp-cache"])
fi fi
# libfreerdp-channels (1.0) / libfreerdp-client (1.1) # libfreerdp-channels (1.0) / libfreerdp-client + libfreerdp-core (1.1)
if test "x${have_freerdp}" = "xyes" if test "x${have_freerdp}" = "xyes"
then then
AC_CHECK_LIB([freerdp-client], [freerdp_channels_new], 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])],
[-lfreerdp-core])
fi fi
# libfreerdp-utils # libfreerdp-utils