diff --git a/configure.in b/configure.in
index 2a0aa14d..d6d738c5 100644
--- a/configure.in
+++ b/configure.in
@@ -171,7 +171,6 @@ AC_ARG_ENABLE(x11,
  [want_x11="$enableval"])
 
 
-AM_CONDITIONAL(BUILD_X11, test x$want_x11)
 if test x$want_x11 == xyes; then
 	AC_PATH_X
 	AC_PATH_XTRA
@@ -183,15 +182,15 @@ if test x$want_x11 == xyes; then
 	fi
 	AC_DEFINE(X11, 1, [Define if you want to use X11])
 	AC_DEFINE(HAVE_X11, 1, [Define if you have X11])
+	AM_CONDITIONAL(BUILD_X11, true)
 	if test $dah != "no"; then
 		AC_DEFINE(DOUBLE_BUFFER, 1, [Define if you want support for the DBE extension])
 		AC_CHECK_LIB(Xext, XdbeQueryExtension, [AC_DEFINE([HAVE_XDBE], 1, [Xdbe]) LIBS="$LIBS -lXext"],
 		     [AC_MSG_ERROR([something went wrong when checking for Xdbe (double buffer extension)])])
 	fi
+else
+	AM_CONDITIONAL(BUILD_X11, false)
 fi
-AM_CONDITIONAL(HAVE_X11, test x$want_x11)
-
-
 
 dnl
 dnl Xft