Merge branch 'v0.20.x'

2018-08-02 11:07:40 +02:00
parent 22192adbc8 906972973e
commit cf471e830f
19 changed files with 66 additions and 47 deletions
@@ -316,7 +316,7 @@ else
 fi

 default_enable_daemon=yes
-if test x$host_is_android = xyes || test x$host_is_android = xyes; then
+if test x$host_is_android = xyes || test x$host_is_windows = xyes; then
 	default_enable_daemon=no
 fi
 AC_ARG_ENABLE(daemon,