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

This commit is contained in:
Michael Jumper 2020-01-13 18:17:32 -08:00
parent 3dfd2467c3
commit de3300ed89

View File

@ -538,6 +538,10 @@ AC_ARG_WITH([rdp],
[],
[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"
then
have_freerdp2=yes
@ -657,6 +661,9 @@ then
fi
# Restore CPPFLAGS, removing FreeRDP-specific options needed for testing
CPPFLAGS="$OLDCPPFLAGS"
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"])
#