Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GUACAMOLE-1026: Correct and clean up FreeRDP presence/absence reporting by configure. #540

Merged
merged 1 commit into from
Aug 28, 2024
Merged

GUACAMOLE-1026: Correct and clean up FreeRDP presence/absence reporting by configure. #540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ fi
#

freerdp_version=
have_freerdp=
have_freerdp=disabled
FREERDP_PLUGIN_DIR=

AC_ARG_WITH([rdp],
Expand All @@ -752,7 +752,7 @@ OLDCPPFLAGS="$CPPFLAGS"

if test "x$with_rdp" != "xno"
then
freerdp_version=3
freerdp_version="(3.x)"
have_freerdp=yes
PKG_CHECK_MODULES([RDP], [freerdp3 freerdp-client3 winpr3],
[CPPFLAGS="${RDP_CFLAGS} -Werror $CPPFLAGS"]
Expand All @@ -768,7 +768,7 @@ fi

if test "x$with_rdp" != "xno" -a "x${have_freerdp}" = "xno"
then
freerdp_version=2
freerdp_version="(2.x)"
have_freerdp=yes
PKG_CHECK_MODULES([RDP], [freerdp2 freerdp-client2 winpr2],
[CPPFLAGS="${RDP_CFLAGS} -Werror $CPPFLAGS"]
Expand Down Expand Up @@ -1494,7 +1494,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION

Library status:

freerdp${freerdp_version} ............ ${have_freerdp}
freerdp ............. ${have_freerdp} ${freerdp_version}
pango ............... ${have_pango}
libavcodec .......... ${have_libavcodec}
libavformat ......... ${have_libavformat}
Expand Down Expand Up @@ -1524,7 +1524,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
guacenc .... ${build_guacenc}
guaclog .... ${build_guaclog}

FreeRDP${freerdp_version} plugins: ${build_rdp_plugins}
FreeRDP plugins: ${build_rdp_plugins}
Init scripts: ${build_init}
Systemd units: ${build_systemd}

Expand Down
Loading