Make colour macros more flexible.

[rrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 96dc8f22fd3c1e30649a0a3cc22dcbef36204673..fbc8f77da2bcc8a263089812feccf94663fbd06b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,11 +31,11 @@ AH_BOTTOM([#include <conf_post.h>])
 
 # Checks for curses
 AC_ARG_WITH([curses], [AS_HELP_STRING([--with-curses],
-  [use curses for playing in text mode (default: auto)])],
+  [build UI for text mode via curses (default: auto)])],
   [], [with_curses=auto])
 AS_IF([test x"$with_curses" != x"no"],
   [DX_LIB_CURSES([have_curses=yes], [have_curses=no])])
-AS_IF([test x"$with_curses" = x"yes" && x"$have_curses" != x"yes"],
+AS_IF([test x"$with_curses" = x"yes" && test x"$have_curses" != x"yes"],
   [AC_MSG_FAILURE([--with-curses requested but curses was not found])])
 AM_CONDITIONAL([HAVE_CURSES], [test x"$have_curses" = x"yes"])
 
@@ -44,6 +44,11 @@ AM_COND_IF([HAVE_CURSES],
 DX_CHECK_CURSES_MOUSE_SUPPORT])
 
 # Checks for X11
+m4_copy([AC_ARG_WITH], [save_AC_ARG_WITH])
+m4_pushdef([AC_ARG_WITH], [m4_case([$1], [x],
+  [m4_popdef([$0])$0([x], AS_HELP_STRING([--with-x],
+    [build UI for the X Window System (default: auto)]), m4_shift2($@))],
+  [m4_pushdef([$0], m4_defn([save_$0]))$0($@)m4_popdef([$0])])])
 AC_PATH_XTRA
 AS_IF([test x"$no_x" != x"yes"],
 [AC_CACHE_CHECK([for Motif], [dx_cv_have_motif],
@@ -70,6 +75,29 @@ AM_COND_IF([HAVE_MOTIF],
 AH_TEMPLATE([X11_RENDER_DEBUG],
   [Define to 1 to enable visual aids for debugging X11 rendering.])
 
+# Check for XmPIXMAP_AND_STRING.
+#
+# Just checking for the existence of this identifier is sufficient, to ensure
+# that the C compiler accepts the name.  If it turns out to not actually be
+# supported by the library used at runtime, Motif itself will catch this
+# and set to the default (i.e., XmSTRING).
+AM_COND_IF([HAVE_MOTIF],
+[AC_CACHE_CHECK([whether Motif supports XmPIXMAP_AND_STRING],
+[dx_cv_motif_have_pixmap_and_string],
+[save_CFLAGS=$CFLAGS save_LIBS=$LIBS
+CFLAGS="$MOTIF_CFLAGS $CFLAGS" LIBS="$MOTIF_LIBS $LIBS"
+AC_COMPUTE_INT([dx_tmp],
+  [XmPIXMAP != XmPIXMAP_AND_STRING && XmSTRING != XmPIXMAP_AND_STRING],
+  [#include <Xm/Label.h>], [dx_tmp=0])
+AS_IF([test x"$dx_tmp" = x"1"],
+  [dx_cv_motif_have_pixmap_and_string=yes],
+  [dx_cv_motif_have_pixmap_and_string=no])
+CFLAGS=$save_CFLAGS LIBS=$save_LIBS])
+AS_IF([test x"$dx_cv_motif_have_pixmap_and_string" = x"yes"],
+  [AC_DEFINE([HAVE_MOTIF_PIXMAP_AND_STRING], [1],
+    [Define to 1 if Motif supports XmPIXMAP_AND_STRING])])
+])
+
 AC_CONFIG_TESTDIR([.], [t:.])
 DX_PROG_AUTOTEST
 AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])