X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/ee68c7cd53763caeb44de97f1036ebaf014a7292..ca97af514870895e228df0443adc5a16be4d9a78:/configure.ac

diff --git a/configure.ac b/configure.ac
index 9b39749..4be4c2a 100644
--- 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],
@@ -57,7 +62,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <Xm/XmAll.h>],
   [dx_cv_have_motif=yes], [dx_cv_have_motif=no])
 CFLAGS=$save_CFLAGS LIBS=$save_LIBS])])
 
-AS_IF([test x"$with_x" = x"yes" && test "$dx_cv_have_motif" != x"yes"],
+AS_IF([test x"$with_x" = x"yes" && test x"$dx_cv_have_motif" != x"yes"],
   [AC_MSG_FAILURE([--with-x requested but Motif was not found])])
 
 AC_SUBST([MOTIF_CFLAGS], [@&t@])