isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare OS name against freebsd* and netbsd* not freebsd and netbsd.

Browse Source 
Fixes an issue on NetBSD where host_os starts with netbsdelf.
This commit is contained in:
Todd C. Miller
2021-03-08 14:05:39 -07:00
parent 07af7caf73
commit 0e2ba920ee
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -18732,7 +18732,7 @@ then :
printf "%s\n" "#define HAVE_LOGIN_CAP_H 1" >>confdefs.h printf "%s\n" "#define HAVE_LOGIN_CAP_H 1" >>confdefs.h
LOGINCAP_USAGE='[-c class] '; LCMAN=1 LOGINCAP_USAGE='[-c class] '; LCMAN=1
case "$OS" in case "$OS" in
freebsd|netbsd) freebsd*|netbsd*)
SUDO_LIBS="${SUDO_LIBS} -lutil" SUDO_LIBS="${SUDO_LIBS} -lutil"
SUDOERS_LIBS="${SUDOERS_LIBS} -lutil" SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
;; ;;
@@ -28101,7 +28101,7 @@ fi
fi fi
case "$OS" in case "$OS" in
netbsd) netbsd*)
;; ;;
*) *)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--enable-new-dtags" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--enable-new-dtags" >&5

4
configure.ac
View File

@@ -2581,7 +2581,7 @@ SUDO_MAILDIR
if test ${with_logincap-'no'} != "no"; then if test ${with_logincap-'no'} != "no"; then
AC_CHECK_HEADERS([login_cap.h], [LOGINCAP_USAGE='[[-c class]] '; LCMAN=1 AC_CHECK_HEADERS([login_cap.h], [LOGINCAP_USAGE='[[-c class]] '; LCMAN=1
case "$OS" in case "$OS" in
freebsd|netbsd) freebsd*|netbsd*)
SUDO_LIBS="${SUDO_LIBS} -lutil" SUDO_LIBS="${SUDO_LIBS} -lutil"
SUDOERS_LIBS="${SUDOERS_LIBS} -lutil" SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
;; ;;
@@ -4449,7 +4449,7 @@ dnl Otherwise, LD_LIBRARY_PATH does not work when running the tests.
dnl We don't do this on NetBSD where RPATH already supports LD_LIBRARY_PATH. dnl We don't do this on NetBSD where RPATH already supports LD_LIBRARY_PATH.
dnl dnl
case "$OS" in case "$OS" in
netbsd) netbsd*)
;; ;;
*) *)
AX_CHECK_LINK_FLAG([-Wl,--enable-new-dtags], [AX_APPEND_FLAG([-Wl,--enable-new-dtags], [LDFLAGS])]) AX_CHECK_LINK_FLAG([-Wl,--enable-new-dtags], [AX_APPEND_FLAG([-Wl,--enable-new-dtags], [LDFLAGS])])