AC_SUBST([MOTIF_CFLAGS], [@&t@])
AC_SUBST([MOTIF_LIBS], [@&t@])
-AS_IF([test x"$dx_cv_have_motif" = x"yes"],
+AM_CONDITIONAL([HAVE_MOTIF],
+ [test x"$with_x" != x"no" && test x"$dx_cv_have_motif" = x"yes"])
+AM_COND_IF([HAVE_MOTIF],
[MOTIF_CFLAGS=$dx_cv_motif_cflags MOTIF_LIBS=$dx_cv_motif_libs],
[AC_DEFINE([X_DISPLAY_MISSING])])
-AM_CONDITIONAL([HAVE_MOTIF], [test x"$dx_cv_have_motif" = x"yes"])
AH_TEMPLATE([X11_RENDER_DEBUG],
[Define to 1 to enable visual aids for debugging X11 rendering.])