1 $NetBSD: patch-ag,v 1.16 2010/09/10 17:11:27 spz Exp $
3 * Add "--with-nbsdops" option, NetBSD standard options.
4 * Link with util(3) in the case of DragonFly, too.
5 * When specified "--with-kerb5" option, test existence of several functions
6 even if there is krb5-config. krb5-config dosen't give all definitions for
7 functions (HAVE_KRB5_*).
8 * Remove setting sysconfdir to "/etc".
10 --- configure.orig 2010-09-06 12:03:39.000000000 +0000
12 @@ -1589,7 +1589,7 @@ Fine tuning of the installation director
13 --bindir=DIR user executables [EPREFIX/bin]
14 --sbindir=DIR system admin executables [EPREFIX/sbin]
15 --libexecdir=DIR program executables [EPREFIX/libexec]
16 - --sysconfdir=DIR read-only single-machine data [/etc]
17 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
18 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
19 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
20 --libdir=DIR object code libraries [EPREFIX/lib]
21 @@ -1667,6 +1667,7 @@ Optional Packages:
22 --with-libraries additional libraries to link with
23 --with-efence link with -lefence for malloc() debugging
24 --with-csops add CSOps standard options
25 + --with-nbsdops add NetBSD standard options
26 --without-passwd don't use passwd/shadow file for authentication
27 --with-skey=DIR enable S/Key support
28 --with-opie=DIR enable OPIE support
29 @@ -4038,6 +4039,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
33 +# Check whether --with-nbsdops or --without-nbsdops was given.
34 +if test "${with_nbsdops+set}" = set; then
35 + withval="$with_nbsdops"
36 + case $with_nbsdops in
37 + yes) echo 'Adding NetBSD standard options'
41 + with_tty_tickets=yes
44 + *) echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
51 # Check whether --with-passwd was given.
52 @@ -14153,7 +14170,7 @@ if test "x$ac_cv_header_login_cap_h" = x
54 LOGINCAP_USAGE='[-c class|-] '; LCMAN=1
56 - freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil"
57 + dragonfly*|freebsd*|netbsd*) SUDO_LIBS="${SUDO_LIBS} -lutil"
61 @@ -17124,6 +17141,8 @@ fi
63 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
64 AUTH_OBJS="$AUTH_OBJS kerb5.o"
66 +if test ${with_kerb5-'no'} != "no"; then
68 LIBS="${LIBS} ${SUDO_LIBS}"
69 for ac_func in krb5_verify_user krb5_init_secure_context
70 @@ -18468,7 +18487,6 @@ test "$libexecdir" = '${exec_prefix}/lib
71 test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include'
72 test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
73 test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
74 -test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
76 ac_config_files="$ac_config_files Makefile sudo.man visudo.man sudoers.man sudoers.ldap.man sudoreplay.man sudo_usage.h sudoers"