mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-03 07:45:47 +00:00
Code Issues Releases Wiki Activity

Substitute @SHELL@ into Makefiles

Browse Source
This commit is contained in:
Todd C. Miller
2010-05-21 21:29:44 -04:00
parent 222a4f7c8a
commit 8a8830e34f
9 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -26,7 +26,7 @@ VERSION = @PACKAGE_VERSION@
LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
SHELL = /bin/sh SHELL = @SHELL@
all install install-dirs install-binaries install-includes install-man install-plugin: config.status all install install-dirs install-binaries install-includes install-man install-plugin: config.status
for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done

2
compat/Makefile.in
View File

@@ -47,7 +47,7 @@ DEFS = @OSDEFS@
#### End of system configuration section. #### #### End of system configuration section. ####
SHELL = /bin/sh SHELL = @SHELL@
LIBOBJDIR = LIBOBJDIR =

29
configure vendored
View File

@@ -2772,6 +2772,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
timeout=5 timeout=5
@@ -6569,13 +6570,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else else
lt_cv_nm_interface="BSD nm" lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:6572: $ac_compile\"" >&5) (eval echo "\"\$as_me:6573: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err) (eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5 cat conftest.err >&5
(eval echo "\"\$as_me:6575: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval echo "\"\$as_me:6576: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5 cat conftest.err >&5
(eval echo "\"\$as_me:6578: output\"" >&5) (eval echo "\"\$as_me:6579: output\"" >&5)
cat conftest.out >&5 cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin" lt_cv_nm_interface="MS dumpbin"
@@ -7780,7 +7781,7 @@ ia64-*-hpux*)
;; ;;
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 7783 "configure"' > conftest.$ac_ext echo '#line 7784 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@@ -9172,11 +9173,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9175: $lt_compile\"" >&5) (eval echo "\"\$as_me:9176: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:9179: \$? = $ac_status" >&5 echo "$as_me:9180: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@@ -9511,11 +9512,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9514: $lt_compile\"" >&5) (eval echo "\"\$as_me:9515: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:9518: \$? = $ac_status" >&5 echo "$as_me:9519: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@@ -9616,11 +9617,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9619: $lt_compile\"" >&5) (eval echo "\"\$as_me:9620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:9623: \$? = $ac_status" >&5 echo "$as_me:9624: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@@ -9671,11 +9672,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9674: $lt_compile\"" >&5) (eval echo "\"\$as_me:9675: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:9678: \$? = $ac_status" >&5 echo "$as_me:9679: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@@ -12038,7 +12039,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12041 "configure" #line 12042 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -12134,7 +12135,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12137 "configure" #line 12138 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H

1
configure.in
View File

@@ -13,6 +13,7 @@ dnl
dnl Variables that get substituted in the Makefile and man pages dnl Variables that get substituted in the Makefile and man pages
dnl dnl
AC_SUBST([HAVE_BSM_AUDIT]) AC_SUBST([HAVE_BSM_AUDIT])
AC_SUBST([SHELL])
AC_SUBST([LIBTOOL]) AC_SUBST([LIBTOOL])
AC_SUBST([CFLAGS]) AC_SUBST([CFLAGS])
AC_SUBST([PROGS]) AC_SUBST([PROGS])

2
doc/Makefile.in
View File

@@ -47,7 +47,7 @@ install_gid = 0
#### End of system configuration section. #### #### End of system configuration section. ####
SHELL = /bin/sh SHELL = @SHELL@
DOCS = sudo.man visudo.man sudoers.man sudoers.ldap.man sudoers.man \ DOCS = sudo.man visudo.man sudoers.man sudoers.ldap.man sudoers.man \
sudoreplay.man sudo_plugin.man sudoreplay.man sudo_plugin.man

2
include/Makefile.in
View File

@@ -36,7 +36,7 @@ install_gid = 0
#### End of system configuration section. #### #### End of system configuration section. ####
SHELL = /bin/sh SHELL = @SHELL@
all: all:

2
plugins/sample/Makefile.in
View File

@@ -62,7 +62,7 @@ DEFS = @OSDEFS@
#### End of system configuration section. #### #### End of system configuration section. ####
SHELL = /bin/sh SHELL = @SHELL@
OBJS = sample_plugin.lo OBJS = sample_plugin.lo

2
plugins/sudoers/Makefile.in
View File

@@ -95,7 +95,7 @@ DEFS = @OSDEFS@ -D_PATH_SUDOERS=\"$(sudoersdir)/sudoers\" -DSUDOERS_UID=$(sudoer
#### End of system configuration section. #### #### End of system configuration section. ####
SHELL = /bin/sh SHELL = @SHELL@
AUTH_OBJS = sudo_auth.lo @AUTH_OBJS@ AUTH_OBJS = sudo_auth.lo @AUTH_OBJS@

2
src/Makefile.in
View File

@@ -68,7 +68,7 @@ DEFS = @OSDEFS@
#### End of system configuration section. #### #### End of system configuration section. ####
SHELL = /bin/sh SHELL = @SHELL@
PROGS = @PROGS@ PROGS = @PROGS@