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

GUACAMOLE-935: Use C preprocessor to determine FreeRDP version rather than running a test program.

Browse Source 
AC_RUN_IFELSE cannot be used when cross-compiling, whereas AC_EGREP_CPP
can.
This commit is contained in:
Michael Jumper 2020-01-21 17:00:44 -08:00
parent 26dfc533bd
commit 49df9f04e0
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -589,23 +589,16 @@ then
# manually free all data associated with the rdpBitmap, even data which # manually free all data associated with the rdpBitmap, even data which
# was not allocated by the implementation. # was not allocated by the implementation.
AC_MSG_CHECKING([whether Bitmap_Free() frees the rdpBitmap and its image data]) AC_MSG_CHECKING([whether Bitmap_Free() frees the rdpBitmap and its image data])
AC_RUN_IFELSE([AC_LANG_SOURCE([[ AC_EGREP_CPP([\"2.0.0-dev\"], [
#include <freerdp/version.h> #include <freerdp/version.h>
FREERDP_VERSION_FULL
#include <string.h> ],
int main() {
/* Return successfully if version is 2.0.0-rc0 */
return strcmp(FREERDP_VERSION_FULL, "2.0.0-dev");
}
]])],
[AC_MSG_RESULT([yes])] [AC_MSG_RESULT([yes])]
[AC_DEFINE([FREERDP_BITMAP_FREE_FREES_BITMAP],, [AC_DEFINE([FREERDP_BITMAP_FREE_FREES_BITMAP],,
[Whether Bitmap_Free() frees the rdpBitmap and its image data])], [Whether Bitmap_Free() frees the rdpBitmap and its image data])],
[AC_MSG_RESULT([no])], [AC_MSG_RESULT([no])])
[AC_MSG_RESULT([assuming no (cross-compiling)])])
fi fi