$NetBSD: patch-configure,v 1.11 2023/08/13 14:14:37 taca Exp $

* Add "--with-nbsdops" option, NetBSD standard options.
* When specified "--with-kerb5" option, test existence of several functions
  even if there is krb5-config.  krb5-config dosen't give all definitions for
  functions (HAVE_KRB5_*).
* Remove setting sysconfdir to "/etc".

--- configure.orig	2023-07-24 20:25:13.000000000 +0000
+++ configure
@@ -937,6 +937,7 @@ with_incpath
 with_libpath
 with_libraries
 with_csops
+with_nbsdops
 with_passwd
 with_skey
 with_opie
@@ -1676,7 +1677,7 @@ Fine tuning of the installation director
   --bindir=DIR            user executables [EPREFIX/bin]
   --sbindir=DIR           system admin executables [EPREFIX/sbin]
   --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [/etc]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
@@ -1808,6 +1809,7 @@ Optional Packages:
   --with-libpath          additional places to look for libraries
   --with-libraries        additional libraries to link with
   --with-csops            add CSOps standard options
+  --with-nbsdops          add NetBSD standard options
   --without-passwd        don't use passwd/shadow file for authentication
   --with-skey[=DIR]       enable S/Key support
   --with-opie[=DIR]       enable OPIE support
@@ -5329,6 +5331,23 @@ fi
 
 
 
+# Check whether --with-nbsdops was given.
+if test "${with_nbsdops+set}" = set; then :
+  withval=$with_nbsdops; case $with_nbsdops in
+    yes)       echo 'Adding NetBSD standard options'
+               CHECKSIA=false
+               with_ignore_dot=yes
+               with_env_editor=yes
+               with_tty_tickets=yes
+               ;;
+    no)                ;;
+    *)         echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
+               ;;
+esac
+fi
+
+
+
 # Check whether --with-passwd was given.
 if test ${with_passwd+y}
 then :
@@ -18263,7 +18282,7 @@ fi
 		: ${mansectform='4'}
 		: ${mansectmisc='5'}
 		;;
-    *-*-linux*|*-*-k*bsd*-gnu)
+    *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd)
 		shadow_funcs="getspnam"
 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
 		# Check for SECCOMP_MODE_FILTER in linux/seccomp.h
@@ -29669,6 +29688,8 @@ rm -f core conftest.err conftest.$ac_obj
      ;;
 esac
 fi
+fi
+if test ${with_kerb5-'no'} != "no"; then
     _LIBS="$LIBS"
     LIBS="${LIBS} ${SUDOERS_LIBS}"
     ac_fn_c_check_func "$LINENO" "krb5_verify_user" "ac_cv_func_krb5_verify_user"
@@ -35634,7 +35655,6 @@ test X"$localedir" = X'${datarootdir}/lo
 test X"$localstatedir" = X'${prefix}/var' && localstatedir='$(prefix)/var'
 test X"$runstatedir" = X'${localstatedir}/run' && runstatedir='$(localstatedir)/run'
 test X"$adminconfdir" = X'${prefix}/etc' && adminconfdir='$(prefix)/etc'
-test X"$sysconfdir" = X'${prefix}/etc' && sysconfdir='/etc'
 
 # The configuration file search path is to check adminconfdir first and
 # fall back to sysconfdir.  This can support systems with read-only