Substitute @SHELL@ into Makefiles

diff --git a/Makefile.in b/Makefile.in
index 693da28b2be76025ed29bcff6936ed87e7bc306b..1153e1906f6e24d1d09fa748502eed01354dc7a3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ VERSION = @PACKAGE_VERSION@
 
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 all install install-dirs install-binaries install-includes install-man install-plugin: config.status
        for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done

diff --git a/compat/Makefile.in b/compat/Makefile.in
index 30eb6d9b497ce11702b9d2a6c3a602df41b5fbca..769ab66d1fff831828b184d8e59f6b42a4327ebb 100644 (file)
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -47,7 +47,7 @@ DEFS = @OSDEFS@
 
 #### End of system configuration section. ####
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 LIBOBJDIR = 
 

diff --git a/configure b/configure
index 9ff749d4d86f3c4f75c41042a2f31a1208b59530..4a9f6533f5e7f3e00c68942021fd98e9eb9d16d4 100755 (executable)
--- a/configure
+++ b/configure
@@ -2772,6 +2772,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
 
 
 
+
 
 
 timeout=5
@@ -6569,13 +6570,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   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)
   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)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6578: output\"" >&5)
+  (eval echo "\"\$as_me:6579: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7780,7 +7781,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # 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
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9172,11 +9173,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -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)
    ac_status=$?
    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
      # The compiler can only warn and ignore the option if not recognized
      # 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: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -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)
    ac_status=$?
    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
      # The compiler can only warn and ignore the option if not recognized
      # 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: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -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)
    ac_status=$?
    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
    then
      # 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: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -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)
    ac_status=$?
    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
    then
      # 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_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12041 "configure"
+#line 12042 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12134,7 +12135,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12137 "configure"
+#line 12138 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/configure.in b/configure.in
index 95e7b2e78bc5ffe8b7511ff52e44c178089ba834..25e00d8484b1593243999c5bfb08f1e00ae50329 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,7 @@ dnl
 dnl Variables that get substituted in the Makefile and man pages
 dnl
 AC_SUBST([HAVE_BSM_AUDIT])
+AC_SUBST([SHELL])
 AC_SUBST([LIBTOOL])
 AC_SUBST([CFLAGS])
 AC_SUBST([PROGS])

diff --git a/doc/Makefile.in b/doc/Makefile.in
index f9d81c02f702792956827d212949d569df77982c..e3645a6196c85509dc6068000ce56222760b4a3c 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -47,7 +47,7 @@ install_gid = 0
 
 #### End of system configuration section. ####
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 DOCS = sudo.man visudo.man sudoers.man sudoers.ldap.man sudoers.man \
        sudoreplay.man sudo_plugin.man

diff --git a/include/Makefile.in b/include/Makefile.in
index b8855a9dccf29375d4feb7144e39469484fcc619..53a196cc9a3146f1d3d894f68b68d422b0a7d416 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -36,7 +36,7 @@ install_gid = 0
 
 #### End of system configuration section. ####
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 all:
 

diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
index ba0267388a3ded73320a73da9fab89ea9ea997b8..7ad6df1b2ade6a0b13828a8be1c32fb0b37d639d 100644 (file)
--- a/plugins/sample/Makefile.in
+++ b/plugins/sample/Makefile.in
@@ -62,7 +62,7 @@ DEFS = @OSDEFS@
 
 #### End of system configuration section. ####
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 OBJS = sample_plugin.lo
 

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 42c57e8a28454f9e88f731cc7e2ee5ccdbcb4552..034d00e39fd58bd4b24fd0df31ea6e351dfa2cd1 100644 (file)
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -95,7 +95,7 @@ DEFS = @OSDEFS@ -D_PATH_SUDOERS=\"$(sudoersdir)/sudoers\" -DSUDOERS_UID=$(sudoer
 
 #### End of system configuration section. ####
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 AUTH_OBJS = sudo_auth.lo @AUTH_OBJS@
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 9989d09e7792b9e5dbf193b0e32bff327e8e0cad..60bfa4f06fbc8676529ec55d98235a6f4172cfcc 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -68,7 +68,7 @@ DEFS = @OSDEFS@
 
 #### End of system configuration section. ####
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 PROGS = @PROGS@