From 2d0539869169d2f031dee50c35fde301608b857d Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 28 Aug 2024 10:20:20 -0700
Subject: [PATCH] GUACAMOLE-1026: Correct and clean up FreeRDP presence/absence
 reporting 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.
---
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index b8bd299bf..063e523f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -731,7 +731,7 @@ fi
 #
 
 freerdp_version=
-have_freerdp=
+have_freerdp=disabled
 FREERDP_PLUGIN_DIR=
 
 AC_ARG_WITH([rdp],
@@ -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"]
@@ -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"]
@@ -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}
@@ -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}