GUACAMOLE-249: Use pkg-config to determine location of FreeRDP headers.

This commit is contained in:
Michael Jumper 2019-10-11 16:42:30 -07:00
parent cc7cd78e5b
commit 831606a4e9
2 changed files with 15 additions and 16 deletions

View File

@ -528,11 +528,10 @@ then
fi fi
# #
# FreeRDP 2 # FreeRDP 2 (libfreerdp2, libfreerdp-client2, and libwinpr2)
# #
have_freerdp2=disabled have_freerdp2=disabled
RDP_LIBS=
AC_ARG_WITH([rdp], AC_ARG_WITH([rdp],
[AS_HELP_STRING([--with-rdp], [AS_HELP_STRING([--with-rdp],
[support RDP @<:@default=check@:>@])], [support RDP @<:@default=check@:>@])],
@ -542,13 +541,10 @@ AC_ARG_WITH([rdp],
if test "x$with_rdp" != "xno" if test "x$with_rdp" != "xno"
then then
have_freerdp2=yes have_freerdp2=yes
PKG_CHECK_MODULES([RDP], [freerdp2 freerdp-client2 winpr2],,
# libfreerdp2
AC_CHECK_LIB([freerdp2], [freerdp_new],
[RDP_LIBS="$RDP_LIBS -lfreerdp2 -lfreerdp-client2 -lwinpr2"],
[AC_MSG_WARN([ [AC_MSG_WARN([
-------------------------------------------- --------------------------------------------
Unable to find libfreerdp2 Unable to find FreeRDP (libfreerdp2 / libfreerdp-client2 / libwinpr2)
RDP will be disabled. RDP will be disabled.
--------------------------------------------]) --------------------------------------------])
have_freerdp2=no]) have_freerdp2=no])
@ -556,8 +552,6 @@ fi
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"]) AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"])
AC_SUBST(RDP_LIBS)
# #
# libssh2 # libssh2
# #

View File

@ -138,7 +138,8 @@ libguac_client_rdp_la_CFLAGS = \
-Werror -Wall -Iinclude \ -Werror -Wall -Iinclude \
@COMMON_INCLUDE@ \ @COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \ @COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ @LIBGUAC_INCLUDE@ \
@RDP_CFLAGS@
libguac_client_rdp_la_LDFLAGS = \ libguac_client_rdp_la_LDFLAGS = \
-version-info 0:0:0 \ -version-info 0:0:0 \
@ -158,7 +159,8 @@ guacdr_cflags = \
-Werror -Wall -Iinclude \ -Werror -Wall -Iinclude \
@COMMON_INCLUDE@ \ @COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \ @COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ @LIBGUAC_INCLUDE@ \
@RDP_CFLAGS@
guacdr_ldflags = \ guacdr_ldflags = \
-module -avoid-version -shared \ -module -avoid-version -shared \
@ -177,7 +179,8 @@ guacai_cflags = \
-Werror -Wall -Iinclude \ -Werror -Wall -Iinclude \
@COMMON_INCLUDE@ \ @COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \ @COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ @LIBGUAC_INCLUDE@ \
@RDP_CFLAGS@
guacai_ldflags = \ guacai_ldflags = \
-module -avoid-version -shared \ -module -avoid-version -shared \
@ -196,7 +199,8 @@ guacsnd_cflags = \
-Werror -Wall -Iinclude \ -Werror -Wall -Iinclude \
@COMMON_INCLUDE@ \ @COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \ @COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ @LIBGUAC_INCLUDE@ \
@RDP_CFLAGS@
guacsnd_ldflags = \ guacsnd_ldflags = \
-module -avoid-version -shared \ -module -avoid-version -shared \
@ -215,7 +219,8 @@ guacsvc_cflags = \
-Werror -Wall -Iinclude \ -Werror -Wall -Iinclude \
@COMMON_INCLUDE@ \ @COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \ @COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ @LIBGUAC_INCLUDE@ \
@RDP_CFLAGS@
guacsvc_ldflags = \ guacsvc_ldflags = \
-module -avoid-version -shared \ -module -avoid-version -shared \