From c154f0119b7a6750da90159c437a8732270d02d3 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 19 Jun 2007 19:37:09 +0000 Subject: [PATCH] Can't use the regular autoconf fnmatch() check since we need FNM_CASEFOLD so go back to our custom one. --- aclocal.m4 | 14 ++++++++++++++ configure.in | 5 +---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4b777963b..1e27c39fe 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -210,6 +210,20 @@ dnl AC_DEFUN(SUDO_TYPE_INO_T, [SUDO_CHECK_TYPE(ino_t, unsigned int)]) +dnl +dnl check for working fnmatch(3) +dnl +AC_DEFUN(SUDO_FUNC_FNMATCH, +[AC_MSG_CHECKING([for working fnmatch with FNM_CASEFOLD]) +AC_CACHE_VAL(sudo_cv_func_fnmatch, +[rm -f conftestdata; > conftestdata +AC_TRY_RUN([#include +main() { exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", FNM_CASEFOLD)); }], [sudo_cv_func_fnmatch=yes], [sudo_cv_func_fnmatch=no], + [sudo_cv_func_fnmatch=no]) +rm -f core core.* *.core]) +AC_MSG_RESULT($sudo_cv_func_fnmatch) +AS_IF([test $sudo_cv_func_fnmatch = yes], [$1], [$2])]) + dnl dnl check for isblank(3) dnl diff --git a/configure.in b/configure.in index d71be6f55..dec6e1c3b 100644 --- a/configure.in +++ b/configure.in @@ -1687,10 +1687,7 @@ AC_CHECK_FUNCS(lockf flock, [break]) AC_CHECK_FUNCS(waitpid wait3, [break]) AC_CHECK_FUNCS(innetgr _innetgr, [AC_CHECK_FUNCS(getdomainname) [break]]) AC_CHECK_FUNCS(utimes, [AC_CHECK_FUNCS(futimes futimesat, [break])], [AC_CHECK_FUNCS(futime) AC_LIBOBJ(utimes)]) -AC_FUNC_FNMATCH -if test "$ac_cv_func_fnmatch_works" = no; then - AC_LIBOBJ(fnmatch) -fi +SUDO_FUNC_FNMATCH([AC_DEFINE(HAVE_FNMATCH)], [AC_LIBOBJ(fnmatch)]) SUDO_FUNC_ISBLANK AC_REPLACE_FUNCS(memrchr strerror strcasecmp sigaction strlcpy strlcat) AC_CHECK_FUNCS(closefrom, [], [AC_LIBOBJ(closefrom) -- 2.40.0