From: Nick Bowler <nbowler@draconx.ca>
Date: Tue, 7 Jun 2022 00:01:41 +0000 (-0400)
Subject: Fix reconfiguration when using --without-x.
X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/commitdiff_plain/5ad79930f86cb4fd7eb1bdd38a58446168cb239e

Fix reconfiguration when using --without-x.

We need to consider the user's selection when checking whether or not
to build the Motif UI, because the cached result may have come from a
prior configure run.
---

diff --git a/configure.ac b/configure.ac
index 6be037e..2c359a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,11 @@ AS_IF([test x"$with_x" = x"yes" && test "$dx_cv_have_motif" != x"yes"],
 
 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.])