mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 01:49:11 +00:00
Code Issues Releases Wiki Activity

Only redefine _PATH_BSHELL on AIX if we included paths.h.

Browse Source
This commit is contained in:
Todd C. Miller 2014-09-20 10:16:46 -06:00
parent 6be0a820d0
commit 8f75f65bba
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for sudo 1.8.11.
# Generated by GNU Autoconf 2.69 for sudo 1.8.11rc2.
#
# Report bugs to <http://www.sudo.ws/bugs/>.
#
@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sudo'
PACKAGE_TARNAME='sudo'
PACKAGE_VERSION='1.8.11'
PACKAGE_STRING='sudo 1.8.11'
PACKAGE_VERSION='1.8.11rc2'
PACKAGE_STRING='sudo 1.8.11rc2'
PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/'
PACKAGE_URL=''
@ -1509,7 +1509,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures sudo 1.8.11 to adapt to many kinds of systems.
\`configure' configures sudo 1.8.11rc2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1574,7 +1574,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of sudo 1.8.11:";;
short | recursive ) echo "Configuration of sudo 1.8.11rc2:";;
esac
cat <<\_ACEOF
@ -1809,7 +1809,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
sudo configure 1.8.11
sudo configure 1.8.11rc2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2518,7 +2518,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by sudo $as_me 1.8.11, which was
It was created by sudo $as_me 1.8.11rc2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -23718,7 +23718,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by sudo $as_me 1.8.11, which was
This file was extended by sudo $as_me 1.8.11rc2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -23784,7 +23784,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
sudo config.status 1.8.11
sudo config.status 1.8.11rc2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@ -4,7 +4,7 @@ dnl
dnl Copyright (c) 1994-1996,1998-2014 Todd C. Miller <Todd.Miller@courtesan.com>
dnl
AC_PREREQ([2.59])
AC_INIT([sudo], [1.8.11], [http://www.sudo.ws/bugs/], [sudo])
AC_INIT([sudo], [1.8.11rc2], [http://www.sudo.ws/bugs/], [sudo])
AC_CONFIG_HEADER([config.h pathnames.h])
AC_CONFIG_SRCDIR([src/sudo.c])
dnl

4
pathnames.h.in
View File

@ -179,9 +179,9 @@
# undef _PATH_NETSVC_CONF
#endif /* _PATH_NETSVC_CONF */
/* On AIX, _PATH_BSHELL is /usr/bin/bsh but we want /usr/bin/sh */
/* On AIX, _PATH_BSHELL in paths.h is /usr/bin/bsh but we want /usr/bin/sh */
#ifndef _PATH_SUDO_BSHELL
# ifdef _AIX
# if defined(_AIX) && defined(HAVE_PATHS_H)
# define _PATH_SUDO_BSHELL "/usr/bin/sh"
# else
# define _PATH_SUDO_BSHELL _PATH_BSHELL