Add a new method of job invocation to the already existing two choices. Now you may pick one of three: --- pbs-2.3.12-pw/configure | 298 ++++++++++++++++-------------- pbs-2.3.12-pw/configure.in | 15 + pbs-2.3.12-pw/src/include/pbs_config.h.in | 3 pbs-2.3.12-pw/src/resmom/start_exec.c | 39 ++- 4 files changed, 201 insertions(+), 154 deletions(-) diff -puN configure~shell-use-argv configure --- pbs-2.3.12/configure~shell-use-argv 2004-04-17 11:13:31.000000000 -0400 +++ pbs-2.3.12-pw/configure 2004-04-17 11:13:31.000000000 -0400 @@ -243,6 +243,11 @@ ac_help="$ac_help as standard input" ac_help="$ac_help + --enable-shell-use-argv enable this to put the job script name on the + command line that invokes the shell. Not on by + default. Ignores --enable-shell-pipe setting." +ac_help="$ac_help + --enable-rpp use RPP/UDP for resource queries to mom. This is enabled by default. If disabled TCP is used." ac_help="$ac_help @@ -739,7 +744,7 @@ else { echo "configure: error: can not r fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:743: checking host system type" >&5 +echo "configure:748: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -913,7 +918,7 @@ TK=0; TCL=0; TCLX=0; orig_tclx_dir="$tclx_dir" if test "$tclx_dir" = yes; then echo $ac_n "checking Tclx library path prefix""... $ac_c" 1>&6 -echo "configure:917: checking Tclx library path prefix" >&5 +echo "configure:922: checking Tclx library path prefix" >&5 if eval "test \"`echo '$''{'pbs_cv_tclx_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -948,7 +953,7 @@ test -n "$GUI" -a "$tcl_dir" = no && tcl if test "$tcl_dir" = yes; then echo $ac_n "checking Tcl library path prefix""... $ac_c" 1>&6 -echo "configure:952: checking Tcl library path prefix" >&5 +echo "configure:957: checking Tcl library path prefix" >&5 if eval "test \"`echo '$''{'pbs_cv_tcl_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1014,7 +1019,7 @@ if test "$TCL" -eq 1; then done echo $ac_n "checking Tcl version""... $ac_c" 1>&6 -echo "configure:1018: checking Tcl version" >&5 +echo "configure:1023: checking Tcl version" >&5 if eval "test \"`echo '$''{'pbs_cv_ver_tcl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1055,7 +1060,7 @@ if test "$TK" -eq 1; then done echo $ac_n "checking Tk version""... $ac_c" 1>&6 -echo "configure:1059: checking Tk version" >&5 +echo "configure:1064: checking Tk version" >&5 if eval "test \"`echo '$''{'pbs_cv_ver_tk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1164,7 +1169,7 @@ TCLSH_PATH=""; WISH_PATH="" if test "$TCL" -eq 1 ; then # a loose symlink would be bad here echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:1168: checking for tclsh" >&5 +echo "configure:1173: checking for tclsh" >&5 if eval "test \"`echo '$''{'pbs_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1196,7 +1201,7 @@ if test "$TK" -eq 1 ; then # a loose symbolic link will screw us here echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:1200: checking for wish" >&5 +echo "configure:1205: checking for wish" >&5 if eval "test \"`echo '$''{'pbs_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1531,7 +1536,7 @@ if test "${with_scp+set}" = set; then # Extract the first word of ""scp"", so it can be a program name with args. set dummy "scp"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1535: checking for $ac_word" >&5 +echo "configure:1540: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SCP_PATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1577,7 +1582,7 @@ fi -# Check whether --enable-shell_pipe or --disable-shell_pipe was given. +# Check whether --enable-shell-pipe or --disable-shell-pipe was given. if test "${enable_shell_pipe+set}" = set; then enableval="$enable_shell_pipe" case "${enableval}" in @@ -1590,12 +1595,25 @@ else fi +# Check whether --enable-shell-use-argv or --disable-shell-use-argv was given. +if test "${enable_shell_use_argv+set}" = set; then + enableval="$enable_shell_use_argv" + case "${enableval}" in + yes) SHELL_USE_ARGV=1 ;; + no) SHELL_USE_ARGV=0 ;; + *) SHELL_USE_ARGV=0 ;; +esac +else + SHELL_USE_ARGV=0 +fi + + # # run the script in the aux dir to figure out what PBS "machine type" we are on # echo $ac_n "checking PBS machine type""... $ac_c" 1>&6 -echo "configure:1599: checking PBS machine type" >&5 +echo "configure:1617: checking PBS machine type" >&5 if eval "test \"`echo '$''{'pbs_cv_type_mach'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1673,7 @@ if test "${enable_sp2}" = "yes" ; then MOMLIBS="-ljm_client -lSDR" case "${PBS_MACH}" in aix*) echo $ac_n "checking for swtbl_load_table in -lswitchtbl""... $ac_c" 1>&6 -echo "configure:1659: checking for swtbl_load_table in -lswitchtbl" >&5 +echo "configure:1677: checking for swtbl_load_table in -lswitchtbl" >&5 ac_lib_var=`echo switchtbl'_'swtbl_load_table | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1663,7 +1681,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lswitchtbl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1845,7 +1863,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1849: checking for $ac_word" >&5 +echo "configure:1867: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1903,11 +1921,15 @@ cat >> confdefs.h <> confdefs.h <&6 -echo "configure:1911: checking for $ac_word" >&5 +echo "configure:1933: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1941,7 +1963,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1945: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1967: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1949,7 +1971,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1983,7 +2005,7 @@ fi fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1987: checking whether ln -s works" >&5 +echo "configure:2009: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2004,7 +2026,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2008: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2030: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2033,7 +2055,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2037: checking for $ac_word" >&5 +echo "configure:2059: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2065,7 +2087,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2069: checking for $ac_word" >&5 +echo "configure:2091: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2104,7 +2126,7 @@ test -n "$YACC" || YACC="yacc" # Always use the supplied install-sh script instead of trying to divine # which OS has a good install program. echo $ac_n "checking for the install-sh script""... $ac_c" 1>&6 -echo "configure:2108: checking for the install-sh script" >&5 +echo "configure:2130: checking for the install-sh script" >&5 if test -z "$INSTALL"; then INSTALL="$ac_install_sh" fi @@ -2122,7 +2144,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2126: checking for $ac_word" >&5 +echo "configure:2148: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TBL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2157,7 +2179,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2161: checking for $ac_word" >&5 +echo "configure:2183: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PIC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2192,7 +2214,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2196: checking for $ac_word" >&5 +echo "configure:2218: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ROFF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2227,7 +2249,7 @@ test -n "$ROFF" || ROFF="exit" echo $ac_n "checking whether ${MAKE-make} understands '.POSIX:'""... $ac_c" 1>&6 -echo "configure:2231: checking whether ${MAKE-make} understands '.POSIX:'" >&5 +echo "configure:2253: checking whether ${MAKE-make} understands '.POSIX:'" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_${ac_make}_posix_target'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2256,7 +2278,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} understands an initial '+'""... $ac_c" 1>&6 -echo "configure:2260: checking whether ${MAKE-make} understands an initial '+'" >&5 +echo "configure:2282: checking whether ${MAKE-make} understands an initial '+'" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_${ac_make}_posix_plus'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2289,7 +2311,7 @@ pbs_save_CFLAGS="$CFLAGS" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2293: checking for $ac_word" >&5 +echo "configure:2315: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2319,7 +2341,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2323: checking for $ac_word" >&5 +echo "configure:2345: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2370,7 +2392,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2374: checking for $ac_word" >&5 +echo "configure:2396: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2402,7 +2424,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2406: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2428: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2413,12 +2435,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2417 "configure" +#line 2439 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2444,12 +2466,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2448: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2470: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2453: checking whether we are using GNU C" >&5 +echo "configure:2475: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2458,7 +2480,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2477,7 +2499,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2481: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2503: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2534,7 +2556,7 @@ MOM_CHECKPOINT=0 case "$PBS_MACH" in unicos*) MOM_CHECKPOINT=1 ;; irix6*) echo $ac_n "checking for atcheckpoint in -lcpr""... $ac_c" 1>&6 -echo "configure:2538: checking for atcheckpoint in -lcpr" >&5 +echo "configure:2560: checking for atcheckpoint in -lcpr" >&5 ac_lib_var=`echo cpr'_'atcheckpoint | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2542,7 +2564,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcpr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2599,7 +2621,7 @@ esac echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2603: checking size of int" >&5 +echo "configure:2625: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2607,7 +2629,7 @@ else ac_cv_sizeof_int=20 else cat > conftest.$ac_ext < int main() @@ -2618,7 +2640,7 @@ int main() return(0); } EOF -if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2638,7 +2660,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2642: checking size of long" >&5 +echo "configure:2664: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2646,7 +2668,7 @@ else ac_cv_sizeof_long=21 else cat > conftest.$ac_ext < int main() @@ -2657,7 +2679,7 @@ int main() return(0); } EOF -if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2677,7 +2699,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2681: checking size of float" >&5 +echo "configure:2703: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2685,7 +2707,7 @@ else ac_cv_sizeof_float=22 else cat > conftest.$ac_ext < int main() @@ -2696,7 +2718,7 @@ int main() return(0); } EOF -if { (eval echo configure:2700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -2716,7 +2738,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2720: checking size of double" >&5 +echo "configure:2742: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2724,7 +2746,7 @@ else ac_cv_sizeof_double=23 else cat > conftest.$ac_ext < int main() @@ -2735,7 +2757,7 @@ int main() return(0); } EOF -if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2755,7 +2777,7 @@ EOF echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:2759: checking size of long double" >&5 +echo "configure:2781: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2763,7 +2785,7 @@ else ac_cv_sizeof_long_double=24 else cat > conftest.$ac_ext < int main() @@ -2774,7 +2796,7 @@ int main() return(0); } EOF -if { (eval echo configure:2778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -2794,7 +2816,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2798: checking size of short" >&5 +echo "configure:2820: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2802,7 +2824,7 @@ else ac_cv_sizeof_short=25 else cat > conftest.$ac_ext < int main() @@ -2813,7 +2835,7 @@ int main() return(0); } EOF -if { (eval echo configure:2817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2833,7 +2855,7 @@ EOF echo $ac_n "checking size of unsigned""... $ac_c" 1>&6 -echo "configure:2837: checking size of unsigned" >&5 +echo "configure:2859: checking size of unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2841,7 +2863,7 @@ else ac_cv_sizeof_unsigned=26 else cat > conftest.$ac_ext < int main() @@ -2852,7 +2874,7 @@ int main() return(0); } EOF -if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned=`cat conftestval` else @@ -2872,7 +2894,7 @@ EOF echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:2876: checking size of unsigned int" >&5 +echo "configure:2898: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2880,7 +2902,7 @@ else ac_cv_sizeof_unsigned_int=27 else cat > conftest.$ac_ext < int main() @@ -2891,7 +2913,7 @@ int main() return(0); } EOF -if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -2911,7 +2933,7 @@ EOF echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:2915: checking size of unsigned short" >&5 +echo "configure:2937: checking size of unsigned short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2919,7 +2941,7 @@ else ac_cv_sizeof_unsigned_short=28 else cat > conftest.$ac_ext < int main() @@ -2930,7 +2952,7 @@ int main() return(0); } EOF -if { (eval echo configure:2934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_short=`cat conftestval` else @@ -2950,7 +2972,7 @@ EOF echo $ac_n "checking size of unsigned char""... $ac_c" 1>&6 -echo "configure:2954: checking size of unsigned char" >&5 +echo "configure:2976: checking size of unsigned char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2958,7 +2980,7 @@ else ac_cv_sizeof_unsigned_char=29 else cat > conftest.$ac_ext < int main() @@ -2969,7 +2991,7 @@ int main() return(0); } EOF -if { (eval echo configure:2973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_char=`cat conftestval` else @@ -2989,7 +3011,7 @@ EOF echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2993: checking size of unsigned long" >&5 +echo "configure:3015: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2997,7 +3019,7 @@ else ac_cv_sizeof_unsigned_long=30 else cat > conftest.$ac_ext < int main() @@ -3008,7 +3030,7 @@ int main() return(0); } EOF -if { (eval echo configure:3012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -3028,7 +3050,7 @@ EOF echo $ac_n "checking size of signed char""... $ac_c" 1>&6 -echo "configure:3032: checking size of signed char" >&5 +echo "configure:3054: checking size of signed char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_signed_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3036,7 +3058,7 @@ else ac_cv_sizeof_signed_char=31 else cat > conftest.$ac_ext < int main() @@ -3047,7 +3069,7 @@ int main() return(0); } EOF -if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_signed_char=`cat conftestval` else @@ -3067,7 +3089,7 @@ EOF echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3071: checking how to run the C preprocessor" >&5 +echo "configure:3093: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3082,13 +3104,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3099,13 +3121,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3116,13 +3138,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3147,14 +3169,14 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3151: checking whether char is unsigned" >&5 +echo "configure:3173: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3211,12 +3233,12 @@ fi echo $ac_n "checking for h_errno declaration in netdb.h""... $ac_c" 1>&6 -echo "configure:3215: checking for h_errno declaration in netdb.h" >&5 +echo "configure:3237: checking for h_errno declaration in netdb.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_h_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_UNISTD_H @@ -3228,7 +3250,7 @@ int main() { int _ZzQ = (int)(h_errno + 1); ; return 0; } EOF -if { (eval echo configure:3232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_h_errno=yes else @@ -3250,12 +3272,12 @@ fi echo $ac_n "checking for FD_SET eclaration in sys/select.h""... $ac_c" 1>&6 -echo "configure:3254: checking for FD_SET eclaration in sys/select.h" >&5 +echo "configure:3276: checking for FD_SET eclaration in sys/select.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_fdset_sys_select_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef FD_SETSIZE @@ -3287,12 +3309,12 @@ fi for ac_func in setresuid setresgid seteuid setegid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3291: checking for $ac_func" >&5 +echo "configure:3313: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3344,7 +3366,7 @@ readline="test" READLINE_LIBS="" if test "$readline" = "test"; then echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:3348: checking for readline in -lreadline" >&5 +echo "configure:3370: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3352,7 +3374,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3388,7 +3410,7 @@ fi if test "$readline" = "test"; then unset ac_cv_lib_readline_readline echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:3392: checking for readline in -lreadline" >&5 +echo "configure:3414: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3396,7 +3418,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3433,12 +3455,12 @@ if test "$readline" = "test"; then for ac_func in readline do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3437: checking for $ac_func" >&5 +echo "configure:3459: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3500,7 +3522,7 @@ fi # nsl is needed on some systems but duplicates libc.a on others (O2000s) # echo $ac_n "checking for xdr_int in -lc""... $ac_c" 1>&6 -echo "configure:3504: checking for xdr_int in -lc" >&5 +echo "configure:3526: checking for xdr_int in -lc" >&5 ac_lib_var=`echo c'_'xdr_int | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3508,7 +3530,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3538,7 +3560,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for xdr_int in -lnsl""... $ac_c" 1>&6 -echo "configure:3542: checking for xdr_int in -lnsl" >&5 +echo "configure:3564: checking for xdr_int in -lnsl" >&5 ac_lib_var=`echo nsl'_'xdr_int | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3546,7 +3568,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3587,7 +3609,7 @@ fi fi echo $ac_n "checking for ruserok in -lc""... $ac_c" 1>&6 -echo "configure:3591: checking for ruserok in -lc" >&5 +echo "configure:3613: checking for ruserok in -lc" >&5 ac_lib_var=`echo c'_'ruserok | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3595,7 +3617,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3625,7 +3647,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for ruserok in -lsocket""... $ac_c" 1>&6 -echo "configure:3629: checking for ruserok in -lsocket" >&5 +echo "configure:3651: checking for ruserok in -lsocket" >&5 ac_lib_var=`echo socket'_'ruserok | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3633,7 +3655,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3674,7 +3696,7 @@ fi fi echo $ac_n "checking for nlist in -lc""... $ac_c" 1>&6 -echo "configure:3678: checking for nlist in -lc" >&5 +echo "configure:3700: checking for nlist in -lc" >&5 ac_lib_var=`echo c'_'nlist | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3682,7 +3704,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3712,7 +3734,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6 -echo "configure:3716: checking for nlist in -lelf" >&5 +echo "configure:3738: checking for nlist in -lelf" >&5 ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3720,7 +3742,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3761,7 +3783,7 @@ fi fi echo $ac_n "checking for kvm_open in -lkvm""... $ac_c" 1>&6 -echo "configure:3765: checking for kvm_open in -lkvm" >&5 +echo "configure:3787: checking for kvm_open in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3769,7 +3791,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkvm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3809,7 +3831,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3813: checking for dlopen in -ldl" >&5 +echo "configure:3835: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3817,7 +3839,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3860,17 +3882,17 @@ fi # if sys/ioctl.h exists then define a symbol ac_safe=`echo "sys/ioctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ioctl.h""... $ac_c" 1>&6 -echo "configure:3864: checking for sys/ioctl.h" >&5 +echo "configure:3886: checking for sys/ioctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3898,13 +3920,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3902: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3924: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -3922,7 +3944,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -3947,12 +3969,12 @@ fi for ac_func in atexit on_exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3951: checking for $ac_func" >&5 +echo "configure:3973: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff -puN configure.in~shell-use-argv configure.in --- pbs-2.3.12/configure.in~shell-use-argv 2004-04-17 11:13:31.000000000 -0400 +++ pbs-2.3.12-pw/configure.in 2004-04-17 11:13:31.000000000 -0400 @@ -926,7 +926,7 @@ esac]) -AC_ARG_ENABLE(shell_pipe, +AC_ARG_ENABLE(shell-pipe, [ --enable-shell-pipe enable (default) this if you want to have the name of the job script passed to the shell via a pipe. If @@ -939,6 +939,18 @@ AC_ARG_ENABLE(shell_pipe, esac],[SHELL_INVOKE=1])dnl +AC_ARG_ENABLE(shell-use-argv, +[ + --enable-shell-use-argv enable this to put the job script name on the + command line that invokes the shell. Not on by + default. Ignores --enable-shell-pipe setting.], +[case "${enableval}" in + yes) SHELL_USE_ARGV=1 ;; + no) SHELL_USE_ARGV=0 ;; + *) SHELL_USE_ARGV=0 ;; +esac],[SHELL_USE_ARGV=0])dnl + + # # run the script in the aux dir to figure out what PBS "machine type" we are on @@ -1126,6 +1138,7 @@ AC_DEFINE_UNQUOTED(NO_ASN1, ${NO_ASN1}) AC_DEFINE_UNQUOTED(PLOCK_DAEMONS, ${PLOCK_DAEMONS}) AC_DEFINE_UNQUOTED(SCHD_TYPE, "${SCHD_TYPE}") AC_DEFINE_UNQUOTED(SHELL_INVOKE, ${SHELL_INVOKE}) +AC_DEFINE_UNQUOTED(SHELL_USE_ARGV, ${SHELL_USE_ARGV}) dnl Checks for programs. AC_PROG_LEX diff -puN src/include/pbs_config.h.in~shell-use-argv src/include/pbs_config.h.in --- pbs-2.3.12/src/include/pbs_config.h.in~shell-use-argv 2004-04-17 11:13:31.000000000 -0400 +++ pbs-2.3.12-pw/src/include/pbs_config.h.in 2004-04-17 11:13:31.000000000 -0400 @@ -149,6 +149,9 @@ /* PBS specific: set whether job scripts use a pipe */ #undef SHELL_INVOKE +/* PBS specific: set whether shell is invoked with job script on command line */ +#undef SHELL_USE_ARGV + /* PBS Specific: Define if one should use NODEMASK on SGI O2k or Cray T3e */ #undef NODEMASK diff -puN src/resmom/start_exec.c~shell-use-argv src/resmom/start_exec.c --- pbs-2.3.12/src/resmom/start_exec.c~shell-use-argv 2004-04-17 11:13:31.000000000 -0400 +++ pbs-2.3.12-pw/src/resmom/start_exec.c 2004-04-17 11:13:31.000000000 -0400 @@ -495,7 +495,7 @@ finish_exec(pjob) { static char *id = "finish_exec"; struct sigaction act; - char *arg[2]; + char *arg[3]; char buf[MAXPATHLEN+2]; pid_t cpid; struct passwd *pwdp; /* for uid, shell, home dir */ @@ -703,6 +703,7 @@ finish_exec(pjob) (void)job_attr_def[(int)JOB_ATR_errpath].at_decode( pattr, (char *)0, (char *)0, ptc_name); +#if SHELL_USE_ARGV == 0 #if SHELL_INVOKE == 1 } else { @@ -716,6 +717,7 @@ finish_exec(pjob) return; } #endif /* SHELL_INVOKE */ +#endif } @@ -771,6 +773,7 @@ finish_exec(pjob) (void)strcat(buf, JOB_SCRIPT_SUFFIX); (void)chown(buf, pjob->ji_qs.ji_un.ji_momt.ji_exuid, pjob->ji_qs.ji_un.ji_momt.ji_exgid); +#if SHELL_USE_ARGV == 0 #if SHELL_INVOKE == 1 if (is_interactive == 0) { int k; @@ -793,6 +796,7 @@ finish_exec(pjob) (void)close(pipe_script[1]); } #endif /* SHELL_INVOKE */ +#endif /* now we read the session id or error */ @@ -1207,6 +1211,13 @@ finish_exec(pjob) bld_env_variables(&vtable, "ENVIRONMENT", "BATCH"); +#if SHELL_USE_ARGV == 1 + /* connect stdin to /dev/null and feed the name of + * the script on the command line + */ + if (!is_interactive) + script_in = open("/dev/null", O_RDONLY, 0); +#else #if SHELL_INVOKE == 1 /* if passing script file name as input to shell */ @@ -1223,6 +1234,7 @@ finish_exec(pjob) script_in = open("/dev/null", O_RDONLY, 0); } #endif /* SHELL_INVOKE */ +#endif /* SHELL_USE_ARGV */ if (script_in < 0) { log_record(PBSEVENT_ERROR, PBS_EVENTCLASS_JOB, @@ -1348,14 +1360,18 @@ finish_exec(pjob) arg[0] = malloc(strlen(shellname) + 2); strcpy(arg[0], "-"); strcat(arg[0], shellname); +#if SHELL_USE_ARGV == 1 + if (!is_interactive) { + arg[1] = malloc(strlen(path_jobs) + + strlen(pjob->ji_qs.ji_fileprefix) + + strlen(JOB_SCRIPT_SUFFIX) + 1); + strcpy(arg[1], path_jobs); + strcat(arg[1], pjob->ji_qs.ji_fileprefix); + strcat(arg[1], JOB_SCRIPT_SUFFIX); + arg[2] = (char *)0; + } else +#endif arg[1] = (char *)0; - -#if 0 /* def DEBUG */ - for (i=3; i< 40; ++i) { /* check for any extra descriptors */ - if (close(i) >= 0) - fprintf(stderr, "Closed shell file %d\n", i); - } -#endif /* DEBUG */ execve(shell, arg, vtable.v_envp); } else if (cpid == 0) { /* child does demux */ @@ -1378,13 +1394,6 @@ finish_exec(pjob) arg[0] = malloc(strlen(shellname) + 1); strcpy(arg[0], shellname); arg[1] = (char *)0; - -#if 0 /* def DEBUG */ - for (i=5; i< 40; ++i) { /* check for any extra descriptors */ - if (close(i) >= 0) - fprintf(stderr, "Closed demux file %d\n", i); - } -#endif /* DEBUG */ execve(demux, arg, vtable.v_envp); shell = demux; /* for fprintf below */ } _