diff --git a/stepmania/autoconf/m4/opengl.m4 b/stepmania/autoconf/m4/opengl.m4
index aebae267ba..78f4f247ea 100644
--- a/stepmania/autoconf/m4/opengl.m4
+++ b/stepmania/autoconf/m4/opengl.m4
@@ -29,7 +29,9 @@ AC_DEFUN([SM_X_WITH_OPENGL],
 	    [AC_DEFINE(HAVE_LIBXTST, 1, [libXtst available])],
 	    ,
 	    [$XLIBS])
+	AC_DEFINE(HAVE_X11, 1, [X11 libraries present])
     fi
+	AM_CONDITIONAL(HAVE_X11, test "$no_x" != "yes")
 
     AC_SUBST(XCFLAGS)
     AC_SUBST(XLIBS)