Commit 981030d5 authored by Kirk Webb's avatar Kirk Webb

Update SSH_ARGS to remove "Protocol 1" specification.  Everyone needs to
reconfig their object trees!
parent 06d37827
......@@ -1371,6 +1371,7 @@ done
#
......@@ -1757,16 +1758,15 @@ fi
#
# Arguments to ssh to disable strict host key checking, etc
#
# Check whether --with-SSH_ARGS or --without-SSH_ARGS was given.
if test "${with_SSH_ARGS+set}" = set; then
withval="$with_SSH_ARGS"
# Check whether --with-ssh-args or --without-ssh-args was given.
if test "${with_ssh_args+set}" = set; then
withval="$with_ssh_args"
SSH_ARGS="$withval"
else
SSH_ARGS="-q -o \"BatchMode yes\" -o \"StrictHostKeyChecking no\""
SSH_ARGS="$SSH_ARGS -o \"Protocol 1\""
SSH_ARGS="-q -o BatchMode=yes -o StrictHostKeyChecking=no"
fi
......@@ -1936,17 +1936,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1939: checking for $ac_hdr" >&5
echo "configure:1940: checking for $ac_hdr" >&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
#line 1944 "configure"
#line 1945 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1950: \"$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*
......@@ -1985,17 +1985,17 @@ for ac_hdr in linux/videodev.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1988: checking for $ac_hdr" >&5
echo "configure:1989: checking for $ac_hdr" >&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
#line 1993 "configure"
#line 1994 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1999: \"$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*
......@@ -2028,7 +2028,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2031: checking for $ac_word" >&5
echo "configure:2032: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2107,7 +2107,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:2110: checking for a BSD compatible install" >&5
echo "configure:2111: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -2168,7 +2168,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args.
set dummy rsync; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2171: checking for $ac_word" >&5
echo "configure:2172: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......
......@@ -448,13 +448,12 @@ AC_SUBST(ASSIGN)
#
# Arguments to ssh to disable strict host key checking, etc
#
AC_ARG_WITH(SSH_ARGS,
AC_ARG_WITH(ssh-args,
[ --with-ssh-args Specify ssh arguments when running from testbed scripts ],
[
SSH_ARGS="$withval"
],[
SSH_ARGS="-q -o \"BatchMode yes\" -o \"StrictHostKeyChecking no\""
SSH_ARGS="$SSH_ARGS -o \"Protocol 1\""
SSH_ARGS="-q -o BatchMode=yes -o StrictHostKeyChecking=no"
])
AC_SUBST(SSH_ARGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment