69 lines
2.5 KiB
Plaintext
69 lines
2.5 KiB
Plaintext
$NetBSD: patch-af,v 1.33 2016/09/12 17:12:24 taca Exp $
|
|
|
|
* Add "--with-nbsdops" option, NetBSD standard options.
|
|
* Link with util(3) in the case of DragonFly, too.
|
|
* 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.ac.orig 2016-06-22 16:36:23.000000000 +0000
|
|
+++ configure.ac
|
|
@@ -439,6 +439,20 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
|
|
;;
|
|
esac])
|
|
|
|
++AC_ARG_WITH(nbsdops, [AS_HELP_STRING([--with-nbsdops], [add NetBSD standard opt
|
|
+ions])],
|
|
+[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])
|
|
+
|
|
AC_ARG_WITH(passwd, [AS_HELP_STRING([--without-passwd], [don't use passwd/shadow file for authentication])],
|
|
[case $with_passwd in
|
|
yes|no) AC_MSG_CHECKING(whether to use shadow/passwd file authentication)
|
|
@@ -1951,7 +1965,7 @@ case "$host" in
|
|
: ${mansectsu='1m'}
|
|
: ${mansectform='4'}
|
|
;;
|
|
- *-*-linux*|*-*-k*bsd*-gnu)
|
|
+ *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd)
|
|
shadow_funcs="getspnam"
|
|
test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
|
|
;;
|
|
@@ -2299,7 +2313,7 @@ SUDO_MAILDIR
|
|
if test ${with_logincap-'no'} != "no"; then
|
|
AC_CHECK_HEADERS([login_cap.h], [LOGINCAP_USAGE='[[-c class]] '; LCMAN=1
|
|
case "$OS" in
|
|
- freebsd|netbsd)
|
|
+ dragonfly*|freebsd|netbsd)
|
|
SUDO_LIBS="${SUDO_LIBS} -lutil"
|
|
SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
|
|
;;
|
|
@@ -3381,6 +3395,8 @@ if test ${with_kerb5-'no'} != "no"; then
|
|
])
|
|
AUTH_OBJS="$AUTH_OBJS kerb5.lo"
|
|
fi
|
|
+fi
|
|
+if test ${with_kerb5-'no'} != "no"; then
|
|
_LIBS="$LIBS"
|
|
LIBS="${LIBS} ${SUDOERS_LIBS}"
|
|
AC_CHECK_FUNCS([krb5_verify_user krb5_init_secure_context])
|
|
@@ -4220,7 +4236,7 @@ test "$datarootdir" = '${prefix}/share'
|
|
test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
|
|
test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
|
|
test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
|
|
-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
|
|
+dnl test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
|
|
|
|
dnl
|
|
dnl Substitute into the Makefile and man pages
|