Commit 8f2b5bbf authored by Mike Frysinger's avatar Mike Frysinger Committed by Benno Schulenberg
Browse files

configure: fix up word boundary regex logic now that we have gnulib

If we're using the bundled gnulib regex module, then assume word boundary
support is available to avoid issues with the regcomp test.  This also
unifies the different code paths a bit.

This fixes https://savannah.gnu.org/bugs/?50705.
No related merge requests found
Showing with 28 additions and 19 deletions
+28 -19
...@@ -604,18 +604,16 @@ AC_DEFINE_UNQUOTED(NANO_REG_EXTENDED, $nano_cv_flag_reg_extended, ...@@ -604,18 +604,16 @@ AC_DEFINE_UNQUOTED(NANO_REG_EXTENDED, $nano_cv_flag_reg_extended,
AC_MSG_CHECKING([for GNU-style word boundary regex support]) AC_MSG_CHECKING([for GNU-style word boundary regex support])
AC_ARG_WITH(wordbounds, AC_ARG_WITH(wordbounds,
AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]), AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]),
[ case "$with_wordbounds" in [with_wordbounds=$withval], [with_wordbounds=auto])
no) if test "$with_wordbounds" != "no"; then
AC_MSG_RESULT(no) dnl If we're using the bundled gnulib regex module, we know it's supported.
;; if test "$ac_use_included_regex" = "yes"; then
*) with_wordbounds="yes"
AC_MSG_RESULT(yes) fi
# We explicitly don't check if the user forced the option, because
# this is needed for cross compilers and we can't test the target. dnl We explicitly don't check if the user forced the option, because
AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes, dnl this is needed for cross compilers and we can't test the target.
;; if test "$with_wordbounds" != "yes"; then
esac
], [
AC_TRY_RUN([ AC_TRY_RUN([
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
...@@ -633,12 +631,23 @@ int main(void) ...@@ -633,12 +631,23 @@ int main(void)
return 1; return 1;
return 0; return 0;
}], }],
with_wordbounds="yes",
with_wordbounds="no",
with_wordbounds="cross")
fi
fi
case $with_wordbounds in
yes)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes, AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.])
AC_MSG_RESULT(no), ;;
no)
AC_MSG_RESULT(no)
;;
cross)
AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling]) AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling])
) ;;
]) esac
if test x$color_support = xyes; then if test x$color_support = xyes; then
# if test x$CURSES_LIB_NAME = xcurses; then # if test x$CURSES_LIB_NAME = xcurses; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment