maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-249: Preserve CPPFLAGS such that modifications needed for FreeRDP tests affect only FreeRDP tests.

Browse Source
This commit is contained in:
Michael Jumper 2020-01-13 18:17:32 -08:00
parent 3dfd2467c3
commit de3300ed89
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -538,6 +538,10 @@ AC_ARG_WITH([rdp],
[], [],
[with_rdp=check]) [with_rdp=check])
# Preserve CPPFLAGS so it can be restored later, following the addition of
# options specific to FreeRDP tests
OLDCPPFLAGS="$CPPFLAGS"
if test "x$with_rdp" != "xno" if test "x$with_rdp" != "xno"
then then
have_freerdp2=yes have_freerdp2=yes
@ -657,6 +661,9 @@ then
fi fi
# Restore CPPFLAGS, removing FreeRDP-specific options needed for testing
CPPFLAGS="$OLDCPPFLAGS"
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"]) AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"])
# #