Bump dxcommon to get curses configure fixes.

[rrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9b39749c2c0001a2c45d1a721378caaa3090055d..9f290c113c11f6ad243f4dfb14ce7bd282155cf7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,10 @@
-dnl Copyright © 2022 Nick Bowler
+dnl Copyright © 2022-2024 Nick Bowler
 dnl
 dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
 dnl There is NO WARRANTY, to the extent permitted by law.
 
-dnl remove pointless gnulib warning flag check
-AC_DEFUN([gl_CC_GNULIB_WARNINGS])
+DX_PATCH_GNULIB
 
 AC_INIT([rrace], [0], [nbowler@draconx.ca])
 AC_CONFIG_HEADERS([config.h])
@@ -16,26 +15,25 @@ DX_AUTOMAKE_COMPAT
 
 AC_PROG_CC_C99
 gl_EARLY
+
+AC_C_INLINE
+AC_C_FLEXIBLE_ARRAY_MEMBER
+DX_C_FOR_DECLARATIONS
+
 LT_INIT
 gl_INIT
 
 AC_CACHE_SAVE
 m4_include([lib/gnulib.mk])
-
-dnl We will provide our own makefile rules for gettext.  Disable tracing of
-dnl AM_GNU_GETTEXT to prevent autoreconf from running autopoint, and to
-dnl prevent automake from growing gratuitous error conditions.
-m4_traceoff([AM_GNU_GETTEXT])
-AM_GNU_GETTEXT([external])
 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 +42,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 +60,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@])
@@ -93,9 +96,22 @@ AS_IF([test x"$dx_cv_motif_have_pixmap_and_string" = x"yes"],
     [Define to 1 if Motif supports XmPIXMAP_AND_STRING])])
 ])
 
+dnl On ELF systems, linking a program against a string table in shared
+dnl library is very expensive and actually makes things much worse than
+dnl just duplicating the needed strings in the program.
+dnl
+dnl It may help a little bit when static linking or on other shared
+dnl library implementations, which could maybe be auto-detected with
+dnl a configure test, but the penalty for setting these anyway is
+dnl very small (couple hundred bytes of rodata).
+m4_foreach_w([lib], [Xt Xm],
+[AC_DEFINE(m4_toupper(m4_defn([lib]))[STRINGDEFINES], [1],
+[Define to 1 to avoid using the string tables from lib]m4_defn([lib])[.
+On some platforms, or when statically linking lib]m4_defn([lib])[,
+leaving this undefined may reduce the executable size somewhat.])])
+
 AC_CONFIG_TESTDIR([.], [t:.])
-DX_PROG_AUTOTEST
-AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])
+DX_PROG_AUTOTEST_AM
 
 AC_CHECK_PROGS([XPMTOPPM], [xpmtoppm])
 AC_CHECK_PROGS([PNMTOPNG], [pnmtopng])
@@ -147,6 +163,8 @@ AS_IF([test x"$dx_cv_xpm_to_png" = x"gm convert"],
 AC_CHECK_PROGS([OPTIPNG], [optipng])
 : "${OPTIPNG:=:}"
 
+AM_CONDITIONAL([USE_NLS], [test x"$USE_NLS" = x"yes"])
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT