Skip to content

Commit

Permalink
GUACAMOLE-1026: Correct and clean up FreeRDP presence/absence reporti…
Browse files Browse the repository at this point in the history
…ng by configure.

Previously, the name of the library would change and there was no output
for the "disabled" case. Here, the library name remains constant while
version notes are included to the side, and the output of "disabled" is
restored.
  • Loading branch information
mike-jumper committed Aug 28, 2024
1 parent 68f1181 commit 2d05398
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions configure.ac
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

0 comments on commit 2d05398

Please sign in to comment.