use SUDO_FUNC_FNMATCH

diff --git a/configure.in b/configure.in
index 9173569caf8c3c64b6c677801cc5f0c52c3c704f..9c68c5de2caa39e1e1c1ae1fbc4669b2318c57bc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_CONFIG_HEADER(config.h)
 dnl
 dnl This won't work before AC_INIT()
 dnl
-echo "Configuring CU Sudo version 1.5.1"
+echo "Configuring CU Sudo version 1.5.2"
 dnl
 dnl Variables that get substituted in the Makefile
 dnl
@@ -692,12 +692,12 @@ fi
 AC_CHECK_FUNC(innetgr, AC_DEFINE(HAVE_INNETGR) AC_CHECK_FUNCS(getdomainname))
 AC_CHECK_FUNC(getwd, AC_DEFINE(HAVE_GETWD), LIBOBJS="$LIBOBJS getwd.o")
 AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), LIBOBJS="$LIBOBJS strdup.o")
-AC_CHECK_FUNC(fnmatch, AC_DEFINE(HAVE_FNMATCH), LIBOBJS="$LIBOBJS fnmatch.o")
 AC_CHECK_FUNC(lsearch, AC_DEFINE(HAVE_LSEARCH), AC_CHECK_LIB(compat, lsearch, AC_CHECK_HEADER(search.h, AC_DEFINE(HAVE_LSEARCH) SUDO_LIBS="${SUDO_LIBS} -lcompat"; VISUDO_LIBS="${VISUDO_LIBS} -lcompat", LIBOBJS="$LIBOBJS lsearch.o"), LIBOBJS="$LIBOBJS lsearch.o"))
 AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV), AC_FUNC_CHECK(putenv, AC_DEFINE(HAVE_PUTENV), LIBOBJS="$LIBOBJS putenv.o"))
 AC_CHECK_FUNC(utime, AC_DEFINE(HAVE_UTIME)
 SUDO_FUNC_UTIME_POSIX
 AC_FUNC_UTIME_NULL, LIBOBJS="$LIBOBJS utime.o")
+SUDO_FUNC_FNMATCH(AC_DEFINE(HAVE_FNMATCH), LIBOBJS="$LIBOBJS fnmatch.o")
 dnl
 dnl if crypt(3) not in libc, look elsewhere
 dnl
@@ -756,6 +756,7 @@ if test "$with_kerb4" = "yes" -o "$with_kerb5" = "yes"; then
        echo 'Unable to locate kerberos libraries, you will have to edit the Makefile and add -L/path/to/krb/libs to SUDO_LDFLAGS'
     fi
 
+    test "$OS" = "solaris" && echo "If you are using the Sun's Solaris kerberos you will need to remove -ldes from the SUDO_LIBS define in the Makefile"
     SUDO_LIBS="${SUDO_LIBS} -lkrb -ldes"
     if test "$with_kerb5" = "yes"; then
        SUDO_LIBS="${SUDO_LIBS} -ldes425 -lkrb5 -lcrypto -lcom_err"