Skip to content

Commit

Permalink
shell: Enable fnmatch/glob by default
Browse files Browse the repository at this point in the history
As fnmatch(3) and glob(3) from glibc are now working consistently,
this patch enables them by default.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
herbertx committed Jun 1, 2020
1 parent 282bdbd commit 7638476
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ if test "$enable_static" = "yes"; then
export LDFLAGS="-static -Wl,--fatal-warnings"
fi

AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--enable-fnmatch, \
[Use fnmatch(3) from libc]))
AC_ARG_ENABLE(glob, AS_HELP_STRING(--enable-glob, [Use glob(3) from libc]))
AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--disable-fnmatch, \
[Do not use fnmatch(3) from libc]))
AC_ARG_ENABLE(glob, AS_HELP_STRING(--disable-glob, \
[Do not use glob(3) from libc]))

dnl Checks for libraries.

Expand Down Expand Up @@ -122,12 +123,12 @@ if test "$enable_test_workaround" = "yes"; then
[Define if your faccessat tells root all files are executable])
fi

if test "$enable_fnmatch" = yes; then
if test "$enable_fnmatch" != no; then
use_fnmatch=
AC_CHECK_FUNCS(fnmatch, use_fnmatch=yes)
fi

if test "$use_fnmatch" = yes && test "$enable_glob" = yes; then
if test "$use_fnmatch" = yes && test "$enable_glob" != no; then
AC_CHECK_FUNCS(glob)
fi

Expand Down

0 comments on commit 7638476

Please sign in to comment.