78 lines
2.9 KiB
Plaintext
78 lines
2.9 KiB
Plaintext
$NetBSD: patch-ag,v 1.20 2013/03/01 14:24:58 kim 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.orig 2013-02-21 15:43:29.000000000 +0000
|
|
+++ configure 2013-03-01 13:58:36.000000000 +0000
|
|
@@ -1484,7 +1484,7 @@
|
|
--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]
|
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
@@ -1569,6 +1569,7 @@
|
|
--with-libraries additional libraries to link with
|
|
--with-efence link with -lefence for malloc() debugging
|
|
--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
|
|
@@ -3959,6 +3960,22 @@
|
|
esac
|
|
fi
|
|
|
|
+# Check whether --with-nbsdops or --without-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.
|
|
@@ -15632,7 +15649,7 @@
|
|
_ACEOF
|
|
LOGINCAP_USAGE='[-c class|-] '; LCMAN=1
|
|
case "$OS" in
|
|
- freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil"
|
|
+ dragonfly*|freebsd*|netbsd*) SUDO_LIBS="${SUDO_LIBS} -lutil"
|
|
;;
|
|
esac
|
|
|
|
@@ -18569,6 +18586,8 @@
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
AUTH_OBJS="$AUTH_OBJS kerb5.o"
|
|
fi
|
|
+fi
|
|
+if test ${with_kerb5-'no'} != "no"; then
|
|
_LIBS="$LIBS"
|
|
LIBS="${LIBS} ${SUDO_LIBS}"
|
|
for ac_func in krb5_verify_user krb5_init_secure_context
|
|
@@ -20313,7 +20332,6 @@
|
|
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' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
|
|
|
|
ac_config_files="$ac_config_files Makefile sudo_usage.h sudoers"
|
|
|