gen-options.awk: Fix test with older gettext.

[dxcommon.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 75a4b949139837f34e66fb6f776494bdef3ec4d4..cf152d889e9029147c6604c3a850dd13463e2cfd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2015, 2019-2021 Nick Bowler
+dnl Copyright © 2015, 2019-2023 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.
@@ -20,6 +20,14 @@ AM_SILENT_RULES([yes])
 
 DX_INIT([.])
 
+AC_USE_SYSTEM_EXTENSIONS
+AC_C_INLINE
+
+AC_SUBST([STUB_INCLUDES], [@&t@])
+
+AC_CHECK_FUNCS_ONCE([wcwidth])
+AM_CONDITIONAL([HAVE_WCWIDTH], [test x"$ac_cv_func_wcwidth" = x"yes"])
+
 AC_CONFIG_TESTDIR([.])
 DX_PROG_AUTOTEST
 AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])
@@ -29,8 +37,14 @@ AC_CACHE_CHECK([for struct option in <getopt.h>], [dx_cv_have_struct_option],
 [[struct option opt = { "aaaa", 2, (void *)0, 'a' };
 return opt.name[opt.flag ? opt.val : opt.has_arg];]])],
   [dx_cv_have_struct_option=yes], [dx_cv_have_struct_option=no])])
+AS_IF([test x"$dx_cv_have_struct_option" != x"yes"],
+  [AS_VAR_APPEND([STUB_INCLUDES], ['-I${top_srcdir}/t/getopt'])])
+
 AM_CONDITIONAL([HAVE_STRUCT_OPTION],
   [test x"$dx_cv_have_struct_option" = x"yes"])
 
+AC_ARG_VAR([PERL], [command to execute perl programs])
+AC_CHECK_PROGS([PERL], [perl], [false])
+
 AC_CONFIG_FILES([Makefile atlocal])
 AC_OUTPUT