--- a/common/autoconf/lib-x11.m4	Wed Jul 05 20:56:54 2017 +0200
+++ b/common/autoconf/lib-x11.m4	Thu Oct 29 15:24:36 2015 +0100
@@ -29,7 +29,7 @@
 AC_DEFUN_ONCE([LIB_SETUP_X11],
 [
   if test "x$NEEDS_LIB_X11" = xfalse; then
-    if test "x${with_x}" != x; then
+    if (test "x${with_x}" != x && test "x${with_x}" != xno); then
       AC_MSG_WARN([X11 is not used, so --with-x is ignored])
     fi
     X_CFLAGS=