Merge pull request #567 from proski/no-nasm

Don't fail without working nasm if rfxcodec is not enabled
2016-12-20 23:56:24 -02:00 · 2016-12-20 23:56:24 -02:00 · 87c6272f5d
commit 87c6272f5d
parent 8284416e35 914cdcfee2
1 changed files with 6 additions and 0 deletions
--- a/configure.ac
+++ b/configure.ac
@ -125,6 +125,12 @@ AC_ARG_ENABLE(painter, AS_HELP_STRING([--enable-painter],
              [], [enable_painter=no])
 AM_CONDITIONAL(XRDP_PAINTER, [test x$enable_painter = xyes])

+# Don't fail without working nasm if rfxcodec is not enabled
+if test "x$enable_rfxcodec" != xyes; then
+  with_simd=no
+  export with_simd
+fi
+
 # Check if -ldl is needed to use dlopen()
 DLOPEN_LIBS=
 AC_CHECK_FUNC(dlopen, [],