src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dag-Erling Smørgrav <des@FreeBSD.org>	2010-03-08 11:19:52 +0000
committer	Dag-Erling Smørgrav <des@FreeBSD.org>	2010-03-08 11:19:52 +0000
commit	6d4f2dd11a26e3c2c7f4838f72cf07230d7678a4 (patch)
tree	f3af5b582d9a7808774ea77df321abab26782ebf /configure
parent	e5e752b5a70a672df97b5d7ca5c1e58c87a27234 (diff)
download	src-6d4f2dd11a26e3c2c7f4838f72cf07230d7678a4.tar.gz src-6d4f2dd11a26e3c2c7f4838f72cf07230d7678a4.zip

Vendor import of OpenSSH 5.4p1

Notes

Notes: svn path=/vendor-crypto/openssh/dist/; revision=204861

Diffstat (limited to 'configure')

-rwxr-xr-x

configure

11723

1 files changed, 5142 insertions, 6581 deletions

diff --git a/configure b/configure
index 416ea6f7d493..7c19fc204a5f 100755
--- a/configure
+++ b/configure

@@ -1,12 +1,12 @@

#! /bin/sh

-# From configure.ac Revision: 1.427 .

+# From configure.ac Revision: 1.444 .

# Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.62 for OpenSSH Portable.

+# Generated by GNU Autoconf 2.61 for OpenSSH Portable.

# Report bugs to <openssh-unix-dev@mindrot.org>.

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

# This configure script is free software; the Free Software Foundation

# gives unlimited permission to copy, distribute and modify it.

## --------------------- ##

@@ -18,7 +18,7 @@ DUALCASE=1; export DUALCASE # for MKS sh

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

emulate sh

NULLCMD=:

- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

# is contrary to our usage. Disable this feature.

alias -g '${1+"$@"}'='"$@"'

setopt NO_GLOB_SUBST

@@ -40,45 +40,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS

as_cr_digits='0123456789'

as_cr_alnum=$as_cr_Letters$as_cr_digits

-as_nl='

-export as_nl

-# Printing a long string crashes Solaris 7 /usr/bin/printf.

-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

- as_echo='printf %s\n'

- as_echo_n='printf %s'

-else

- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then

- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'

- as_echo_n='/usr/ucb/echo -n'

- else

- as_echo_body='eval expr "X$1" : "X\$.*\$"'

- as_echo_n_body='eval

- arg=$1;

- case $arg in

- *"$as_nl"*)

- expr "X$arg" : "X\$.*\$$as_nl";

- arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

- esac;

- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"

- '

- export as_echo_n_body

- as_echo_n='sh -c $as_echo_n_body as_echo'

- fi

- export as_echo_body

- as_echo='sh -c $as_echo_body as_echo'

-fi

# The user is always right.

if test "${PATH_SEPARATOR+set}" != set; then

- PATH_SEPARATOR=:

- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {

- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||

- PATH_SEPARATOR=';'

- }

+ echo "#! /bin/sh" >conf$$.sh

+ echo "exit 0" >>conf$$.sh

+ chmod +x conf$$.sh

+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

+ PATH_SEPARATOR=';'

+ else

+ PATH_SEPARATOR=:

+ fi

+ rm -f conf$$.sh

# Support unset when possible.

@@ -94,6 +66,8 @@ fi

# there to prevent editors from complaining about space-tab.

# (If _AS_PATH_WALK were called with IFS unset, it would disable word

# splitting by setting IFS to empty value.)

+as_nl='

IFS=" "" $as_nl"

# Find who we are. Look in the path if we contain no directory separator.

@@ -116,7 +90,7 @@ if test "x$as_myself" = x; then

as_myself=$0

if test ! -f "$as_myself"; then

- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

{ (exit 1); exit 1; }

@@ -129,10 +103,17 @@ PS2='> '

PS4='+ '

# NLS nuisances.

-LC_ALL=C

-export LC_ALL

-LANGUAGE=C

-export LANGUAGE

+for as_var in \

+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \

+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \

+ LC_TELEPHONE LC_TIME

+do

+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

+ eval $as_var=C; export $as_var

+ else

+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

+ fi

+done

# Required to use basename.

if expr a : '$a$' >/dev/null 2>&1 &&

@@ -154,7 +135,7 @@ as_me=`$as_basename -- "$0" ||

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

X"$0" : 'X$//$$' \| \

X"$0" : 'X$/$' \| . 2>/dev/null ||

-$as_echo X/"$0" |

+echo X/"$0" |

sed '/^.*\/$[^/][^/]*$\/*$/{

s//\1/

@@ -180,7 +161,7 @@ else

as_have_required=no

- if test $as_have_required = yes && (eval ":

+ if test $as_have_required = yes && (eval ":

(as_func_return () {

(exit \$1)

}

@@ -262,7 +243,7 @@ IFS=$as_save_IFS

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

emulate sh

NULLCMD=:

- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

# is contrary to our usage. Disable this feature.

alias -g '${1+"$@"}'='"$@"'

setopt NO_GLOB_SUBST

@@ -283,7 +264,7 @@ _ASEOF

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

emulate sh

NULLCMD=:

- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

# is contrary to our usage. Disable this feature.

alias -g '${1+"$@"}'='"$@"'

setopt NO_GLOB_SUBST

@@ -363,10 +344,10 @@ fi

if test "x$CONFIG_SHELL" != x; then

for as_var in BASH_ENV ENV

- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

- done

- export CONFIG_SHELL

- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

+ done

+ export CONFIG_SHELL

+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

@@ -435,10 +416,9 @@ fi

test \$exitcode = 0") || {

echo No shell found that supports shell functions.

- echo Please tell bug-autoconf@gnu.org about your system,

- echo including any error possibly output before this message.

- echo This can help us improve future autoconf versions.

- echo Configuration will now proceed without shell functions.

+ echo Please tell autoconf@gnu.org about your system,

+ echo including any error possibly output before this

+ echo message

}

@@ -474,7 +454,7 @@ test \$exitcode = 0") || {

s/-\n.*//

' >$as_me.lineno &&

chmod +x "$as_me.lineno" ||

- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

{ (exit 1); exit 1; }; }

# Don't try to exec as it changes $[0], causing all sort of problems

@@ -502,6 +482,7 @@ case `echo -n x` in

ECHO_N='-n';;

esac

if expr a : '$a$' >/dev/null 2>&1 &&

test "X`expr 00001 : '.*$...$'`" = X001; then

as_expr=expr

@@ -514,22 +495,19 @@ if test -d conf$$.dir; then

rm -f conf$$.dir/conf$$.file

else

rm -f conf$$.dir

- mkdir conf$$.dir 2>/dev/null

-fi

-if (echo >conf$$.file) 2>/dev/null; then

- if ln -s conf$$.file conf$$ 2>/dev/null; then

- as_ln_s='ln -s'

- # ... but there are two gotchas:

- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

- # In both cases, we have to default to `cp -p'.

- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

- as_ln_s='cp -p'

- elif ln conf$$.file conf$$ 2>/dev/null; then

- as_ln_s=ln

- else

+ mkdir conf$$.dir

+fi

+echo >conf$$.file

+if ln -s conf$$.file conf$$ 2>/dev/null; then

+ as_ln_s='ln -s'

+ # ... but there are two gotchas:

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

+ # In both cases, we have to default to `cp -p'.

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

as_ln_s='cp -p'

- fi

+elif ln conf$$.file conf$$ 2>/dev/null; then

+ as_ln_s=ln

else

as_ln_s='cp -p'

@@ -554,10 +532,10 @@ else

as_test_x='

eval sh -c '\''

if test -d "$1"; then

- test -d "$1/.";

+ test -d "$1/.";

else

case $1 in

- -*)set "./$1";;

+ -*)set "./$1";;

esac;

case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

???[sx]*):;;*)false;;esac;fi

@@ -735,7 +713,6 @@ PROG_UPTIME

PROG_IPCS

PROG_TAIL

INSTALL_SSH_PRNG_CMDS

-OPENSC_CONFIG

KRB5CONF

PRIVSEP_PATH

xauth_path

@@ -750,60 +727,6 @@ TEST_SSH_IPV6

LIBOBJS

LTLIBOBJS'

ac_subst_files=''

-ac_user_opts='

-enable_option_checking

-enable_largefile

-with_stackprotect

-with_rpath

-with_cflags

-with_cppflags

-with_ldflags

-with_libs

-with_Werror

-with_solaris_contracts

-with_osfsia

-with_zlib

-with_zlib_version_check

-with_skey

-with_tcp_wrappers

-with_libedit

-with_audit

-with_ssl_dir

-with_openssl_header_check

-with_ssl_engine

-with_pam

-with_rand_helper

-with_prngd_port

-with_prngd_socket

-with_entropy_timeout

-with_privsep_user

-with_sectok

-with_opensc

-with_selinux

-with_kerberos5

-with_privsep_path

-with_xauth

-enable_strip

-with_mantype

-with_md5_passwords

-with_shadow

-with_ipaddr_display

-enable_etc_default_login

-with_default_path

-with_superuser_path

-with_4in6

-with_bsd_auth

-with_pid_dir

-enable_lastlog

-enable_utmp

-enable_utmpx

-enable_wtmp

-enable_wtmpx

-enable_libutil

-enable_pututline

-enable_pututxline

-with_lastlog

ac_precious_vars='build_alias

host_alias

target_alias

@@ -818,8 +741,6 @@ CPP'

# Initialize some variables set by options.

ac_init_help=

ac_init_version=false

-ac_unrecognized_opts=

-ac_unrecognized_sep=

# The variables have the same names as the options, with

# dashes changed to underlines.

cache_file=/dev/null

@@ -918,21 +839,13 @@ do

datarootdir=$ac_optarg ;;

-disable-* | --disable-*)

- ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`

+ ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'`

# Reject names that are not valid shell variable names.

- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2

{ (exit 1); exit 1; }; }

- ac_useropt_orig=$ac_useropt

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

- case $ac_user_opts in

- *"

-"enable_$ac_useropt"

-"*) ;;

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"

- ac_unrecognized_sep=', ';;

- esac

- eval enable_$ac_useropt=no ;;

+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

+ eval enable_$ac_feature=no ;;

-docdir | --docdir | --docdi | --doc | --do)

ac_prev=docdir ;;

@@ -945,21 +858,13 @@ do

dvidir=$ac_optarg ;;

-enable-* | --enable-*)

- ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

+ ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

# Reject names that are not valid shell variable names.

- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2

{ (exit 1); exit 1; }; }

- ac_useropt_orig=$ac_useropt

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

- case $ac_user_opts in

- *"

-"enable_$ac_useropt"

-"*) ;;

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"

- ac_unrecognized_sep=', ';;

- esac

- eval enable_$ac_useropt=\$ac_optarg ;;

+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

+ eval enable_$ac_feature=\$ac_optarg ;;

-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \

@@ -1150,38 +1055,22 @@ do

ac_init_version=: ;;

-with-* | --with-*)

- ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

+ ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

# Reject names that are not valid shell variable names.

- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

+ { echo "$as_me: error: invalid package name: $ac_package" >&2

{ (exit 1); exit 1; }; }

- ac_useropt_orig=$ac_useropt

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

- case $ac_user_opts in

- *"

-"with_$ac_useropt"

-"*) ;;

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"

- ac_unrecognized_sep=', ';;

- esac

- eval with_$ac_useropt=\$ac_optarg ;;

+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

+ eval with_$ac_package=\$ac_optarg ;;

-without-* | --without-*)

- ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`

+ ac_package=`expr "x$ac_option" : 'x-*without-$.*$'`

# Reject names that are not valid shell variable names.

- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

+ { echo "$as_me: error: invalid package name: $ac_package" >&2

{ (exit 1); exit 1; }; }

- ac_useropt_orig=$ac_useropt

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

- case $ac_user_opts in

- *"

-"with_$ac_useropt"

-"*) ;;

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"

- ac_unrecognized_sep=', ';;

- esac

- eval with_$ac_useropt=no ;;

+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

+ eval with_$ac_package=no ;;

--x)

# Obsolete; use --with-x.

@@ -1201,7 +1090,7 @@ do

x_libraries=$ac_optarg ;;

- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option

+ -*) { echo "$as_me: error: unrecognized option: $ac_option

Try \`$0 --help' for more information." >&2

{ (exit 1); exit 1; }; }

;;

@@ -1210,16 +1099,16 @@ Try \`$0 --help' for more information." >&2

ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`

# Reject names that are not valid shell variable names.

expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&

- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2

+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2

{ (exit 1); exit 1; }; }

eval $ac_envvar=\$ac_optarg

export $ac_envvar ;;

# FIXME: should be removed in autoconf 3.0.

- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2

+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2

expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&

- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2

+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2

: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

;;

@@ -1228,38 +1117,22 @@ done

if test -n "$ac_prev"; then

ac_option=--`echo $ac_prev | sed 's/_/-/g'`

- { $as_echo "$as_me: error: missing argument to $ac_option" >&2

+ { echo "$as_me: error: missing argument to $ac_option" >&2

{ (exit 1); exit 1; }; }

-if test -n "$ac_unrecognized_opts"; then

- case $enable_option_checking in

- no) ;;

- fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2

- { (exit 1); exit 1; }; } ;;

- *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;

- esac

-fi

-# Check all directory arguments for consistency.

+# Be sure to have absolute directory names.

for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \

datadir sysconfdir sharedstatedir localstatedir includedir \

oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

libdir localedir mandir

eval ac_val=\$$ac_var

- # Remove trailing slashes.

- case $ac_val in

- */ )

- ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`

- eval $ac_var=\$ac_val;;

- esac

- # Be sure to have absolute directory names.

case $ac_val in

[\\/$]* | ?:[\\/]* ) continue;;

NONE | '' ) case $ac_var in *prefix ) continue;; esac;;

esac

- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

{ (exit 1); exit 1; }; }

done

@@ -1274,7 +1147,7 @@ target=$target_alias

if test "x$host_alias" != x; then

if test "x$build_alias" = x; then

cross_compiling=maybe

- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

If a cross compiler is detected then cross compile mode will be used." >&2

elif test "x$build_alias" != "x$host_alias"; then

cross_compiling=yes

@@ -1290,10 +1163,10 @@ test "$silent" = yes && exec 6>/dev/null

ac_pwd=`pwd` && test -n "$ac_pwd" &&

ac_ls_di=`ls -di .` &&

ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||

- { $as_echo "$as_me: error: Working directory cannot be determined" >&2

+ { echo "$as_me: error: Working directory cannot be determined" >&2

{ (exit 1); exit 1; }; }

test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||

- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2

+ { echo "$as_me: error: pwd does not report name of working directory" >&2

{ (exit 1); exit 1; }; }

@@ -1301,12 +1174,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||

if test -z "$srcdir"; then

ac_srcdir_defaulted=yes

# Try the directory containing this script, then the parent directory.

- ac_confdir=`$as_dirname -- "$as_myself" ||

-$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

- X"$as_myself" : 'X$//$[^/]' \| \

- X"$as_myself" : 'X$//$$' \| \

- X"$as_myself" : 'X$/$' \| . 2>/dev/null ||

-$as_echo X"$as_myself" |

+ ac_confdir=`$as_dirname -- "$0" ||

+$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

+ X"$0" : 'X$//$[^/]' \| \

+ X"$0" : 'X$//$$' \| \

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

+echo X"$0" |

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

s//\1/

@@ -1333,12 +1206,12 @@ else

if test ! -r "$srcdir/$ac_unique_file"; then

test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."

- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2

+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2

{ (exit 1); exit 1; }; }

ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"

ac_abs_confdir=`(

- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2

+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2

{ (exit 1); exit 1; }; }

pwd)`

# When building in place, set srcdir=.

@@ -1387,9 +1260,9 @@ Configuration:

Installation directories:

--prefix=PREFIX install architecture-independent files in PREFIX

- [$ac_default_prefix]

+ [$ac_default_prefix]

--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX

- [PREFIX]

+ [PREFIX]

By default, \`make install' will install all the files in

\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify

@@ -1399,25 +1272,25 @@ for instance \`--prefix=\$HOME'.

For better control, use the options below.

Fine tuning of the installation directories:

- --bindir=DIR user executables [EPREFIX/bin]

- --sbindir=DIR system admin executables [EPREFIX/sbin]

- --libexecdir=DIR program executables [EPREFIX/libexec]

- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]

- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]

- --localstatedir=DIR modifiable single-machine data [PREFIX/var]

- --libdir=DIR object code libraries [EPREFIX/lib]

- --includedir=DIR C header files [PREFIX/include]

- --oldincludedir=DIR C header files for non-gcc [/usr/include]

- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]

- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]

- --infodir=DIR info documentation [DATAROOTDIR/info]

- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]

- --mandir=DIR man documentation [DATAROOTDIR/man]

- --docdir=DIR documentation root [DATAROOTDIR/doc/openssh]

- --htmldir=DIR html documentation [DOCDIR]

- --dvidir=DIR dvi documentation [DOCDIR]

- --pdfdir=DIR pdf documentation [DOCDIR]

- --psdir=DIR ps documentation [DOCDIR]

+ --bindir=DIR user executables [EPREFIX/bin]

+ --sbindir=DIR system admin executables [EPREFIX/sbin]

+ --libexecdir=DIR program executables [EPREFIX/libexec]

+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]

+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]

+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]

+ --libdir=DIR object code libraries [EPREFIX/lib]

+ --includedir=DIR C header files [PREFIX/include]

+ --oldincludedir=DIR C header files for non-gcc [/usr/include]

+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]

+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]

+ --infodir=DIR info documentation [DATAROOTDIR/info]

+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]

+ --mandir=DIR man documentation [DATAROOTDIR/man]

+ --docdir=DIR documentation root [DATAROOTDIR/doc/openssh]

+ --htmldir=DIR html documentation [DOCDIR]

+ --dvidir=DIR dvi documentation [DOCDIR]

+ --pdfdir=DIR pdf documentation [DOCDIR]

+ --psdir=DIR ps documentation [DOCDIR]

_ACEOF

cat <<\_ACEOF

@@ -1435,7 +1308,6 @@ if test -n "$ac_init_help"; then

cat <<\_ACEOF

Optional Features:

- --disable-option-checking ignore unrecognized --enable/--with options

--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)

--enable-FEATURE[=ARG] include FEATURE [ARG=yes]

--disable-largefile omit support for large files

@@ -1477,8 +1349,6 @@ Optional Packages:

--with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)

--with-entropy-timeout Specify entropy gathering command timeout (msec)

--with-privsep-user=user Specify non-privileged user for privilege separation

- --with-sectok Enable smartcard support using libsectok

- --with-opensc[=PFX] Enable smartcard support using OpenSC (optionally in PATH)

--with-selinux Enable SELinux support

--with-kerberos5=PATH Enable Kerberos 5 support

--with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty)

@@ -1515,17 +1385,15 @@ fi

if test "$ac_init_help" = "recursive"; then

# If there are subdirs, report their specific --help.

for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue

- test -d "$ac_dir" ||

- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||

- continue

+ test -d "$ac_dir" || continue

ac_builddir=.

case "$ac_dir" in

.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`

+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

# A ".." for each directory in $ac_dir_suffix.

- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

case $ac_top_builddir_sub in

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

@@ -1561,7 +1429,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

echo &&

$SHELL "$ac_srcdir/configure" --help=recursive

else

- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

fi || ac_status=$?

cd "$ac_pwd" || { ac_status=$?; break; }

done

@@ -1571,10 +1439,10 @@ test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

cat <<\_ACEOF

OpenSSH configure Portable

-generated by GNU Autoconf 2.62

+generated by GNU Autoconf 2.61

-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

This configure script is free software; the Free Software Foundation

gives unlimited permission to copy, distribute and modify it.

_ACEOF

@@ -1585,7 +1453,7 @@ This file contains any messages produced by compilers while

running configure, to aid debugging if configure makes a mistake.

It was created by OpenSSH $as_me Portable, which was

-generated by GNU Autoconf 2.62. Invocation command line was

+generated by GNU Autoconf 2.61. Invocation command line was

$ $0 $@

@@ -1621,7 +1489,7 @@ for as_dir in $PATH

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

- $as_echo "PATH: $as_dir"

+ echo "PATH: $as_dir"

done

IFS=$as_save_IFS

@@ -1656,7 +1524,7 @@ do

continue ;;

*\'*)

- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

esac

case $ac_pass in

1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;

@@ -1708,12 +1576,11 @@ _ASBOX

case $ac_val in #(

*${as_nl}*)

case $ac_var in #(

- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

esac

case $ac_var in #(

_ | IFS | as_nl) ;; #(

- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

*) $as_unset $ac_var ;;

esac ;;

esac

@@ -1743,9 +1610,9 @@ _ASBOX

eval ac_val=\$$ac_var

case $ac_val in

- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

esac

- $as_echo "$ac_var='\''$ac_val'\''"

+ echo "$ac_var='\''$ac_val'\''"

done | sort

echo

@@ -1760,9 +1627,9 @@ _ASBOX

eval ac_val=\$$ac_var

case $ac_val in

- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

esac

- $as_echo "$ac_var='\''$ac_val'\''"

+ echo "$ac_var='\''$ac_val'\''"

done | sort

echo

@@ -1778,8 +1645,8 @@ _ASBOX

echo

test "$ac_signal" != 0 &&

- $as_echo "$as_me: caught signal $ac_signal"

- $as_echo "$as_me: exit $exit_status"

+ echo "$as_me: caught signal $ac_signal"

+ echo "$as_me: exit $exit_status"

} >&5

rm -f core *.core core.conftest.* &&

rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&

@@ -1821,24 +1688,21 @@ _ACEOF

# Let the site file select an alternate cache file if it wants to.

-# Prefer an explicitly selected file to automatically selected ones.

-ac_site_file1=NONE

-ac_site_file2=NONE

+# Prefer explicitly selected file to automatically selected ones.

if test -n "$CONFIG_SITE"; then

- ac_site_file1=$CONFIG_SITE

+ set x "$CONFIG_SITE"

elif test "x$prefix" != xNONE; then

- ac_site_file1=$prefix/share/config.site

- ac_site_file2=$prefix/etc/config.site

+ set x "$prefix/share/config.site" "$prefix/etc/config.site"

else

- ac_site_file1=$ac_default_prefix/share/config.site

- ac_site_file2=$ac_default_prefix/etc/config.site

+ set x "$ac_default_prefix/share/config.site" \

+ "$ac_default_prefix/etc/config.site"

-for ac_site_file in "$ac_site_file1" "$ac_site_file2"

+shift

+for ac_site_file

- test "x$ac_site_file" = xNONE && continue

if test -r "$ac_site_file"; then

- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5

-$as_echo "$as_me: loading site script $ac_site_file" >&6;}

+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5

+echo "$as_me: loading site script $ac_site_file" >&6;}

sed 's/^/| /' "$ac_site_file" >&5

. "$ac_site_file"

@@ -1848,16 +1712,16 @@ if test -r "$cache_file"; then

# Some versions of bash will fail to source /dev/null (special

# files actually), so we avoid doing that.

if test -f "$cache_file"; then

- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5

-$as_echo "$as_me: loading cache $cache_file" >&6;}

+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5

+echo "$as_me: loading cache $cache_file" >&6;}

case $cache_file in

[\\/]* | ?:[\\/]* ) . "$cache_file";;

*) . "./$cache_file";;

esac

else

- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5

-$as_echo "$as_me: creating cache $cache_file" >&6;}

+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5

+echo "$as_me: creating cache $cache_file" >&6;}

>$cache_file

@@ -1871,38 +1735,29 @@ for ac_var in $ac_precious_vars; do

eval ac_new_val=\$ac_env_${ac_var}_value

case $ac_old_set,$ac_new_set in

set,)

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

ac_cache_corrupted=: ;;

,set)

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5

-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5

+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

ac_cache_corrupted=: ;;

,);;

if test "x$ac_old_val" != "x$ac_new_val"; then

- # differences in whitespace do not lead to failure.

- ac_old_val_w=`echo x $ac_old_val`

- ac_new_val_w=`echo x $ac_new_val`

- if test "$ac_old_val_w" != "$ac_new_val_w"; then

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

- ac_cache_corrupted=:

- else

- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}

- eval $ac_var=\$ac_old_val

- fi

- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5

-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}

- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5

-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5

+echo "$as_me: former value: $ac_old_val" >&2;}

+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5

+echo "$as_me: current value: $ac_new_val" >&2;}

+ ac_cache_corrupted=:

fi;;

esac

# Pass precious variables to config.status.

if test "$ac_new_set" = set; then

case $ac_new_val in

- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

*) ac_arg=$ac_var=$ac_new_val ;;

esac

case " $ac_configure_args " in

@@ -1912,10 +1767,10 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

done

if $ac_cache_corrupted; then

- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

+echo "$as_me: error: changes in the environment can compromise the build" >&2;}

+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

{ (exit 1); exit 1; }; }

@@ -1963,10 +1818,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

if test -n "$ac_tool_prefix"; then

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

set dummy ${ac_tool_prefix}gcc; ac_word=$2

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

if test "${ac_cv_prog_CC+set}" = set; then

- $as_echo_n "(cached) " >&6

+ echo $ECHO_N "(cached) $ECHO_C" >&6

else

if test -n "$CC"; then

ac_cv_prog_CC="$CC" # Let the user override the test.

@@ -1979,7 +1834,7 @@ do

for ac_exec_ext in '' $ac_executable_extensions; do

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

ac_cv_prog_CC="${ac_tool_prefix}gcc"

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

done

@@ -1990,11 +1845,11 @@ fi

CC=$ac_cv_prog_CC

if test -n "$CC"; then

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

-$as_echo "$CC" >&6; }

+ { echo "$as_me:$LINENO: result: $CC" >&5

+echo "${ECHO_T}$CC" >&6; }

else

- { $as_echo "$as_me:$LINENO: result: no" >&5

-$as_echo "no" >&6; }

+ { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

@@ -2003,10 +1858,10 @@ if test -z "$ac_cv_prog_CC"; then

ac_ct_CC=$CC

# Extract the first word of "gcc", so it can be a program name with args.

set dummy gcc; ac_word=$2

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

- $as_echo_n "(cached) " >&6

+ echo $ECHO_N "(cached) $ECHO_C" >&6

else

if test -n "$ac_ct_CC"; then

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

@@ -2019,7 +1874,7 @@ do

for ac_exec_ext in '' $ac_executable_extensions; do

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

ac_cv_prog_ac_ct_CC="gcc"

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

done

@@ -2030,11 +1885,11 @@ fi

ac_ct_CC=$ac_cv_prog_ac_ct_CC

if test -n "$ac_ct_CC"; then

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

-$as_echo "$ac_ct_CC" >&6; }

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

+echo "${ECHO_T}$ac_ct_CC" >&6; }

else

- { $as_echo "$as_me:$LINENO: result: no" >&5

-$as_echo "no" >&6; }

+ { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

if test "x$ac_ct_CC" = x; then

@@ -2042,10 +1897,10 @@ fi

else

case $cross_compiling:$ac_tool_warned in

yes:)

-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

whose name does not start with the host triplet. If you think this

configuration is useful to you, please write to autoconf@gnu.org." >&5

-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

whose name does not start with the host triplet. If you think this

configuration is useful to you, please write to autoconf@gnu.org." >&2;}

ac_tool_warned=yes ;;

@@ -2060,10 +1915,10 @@ if test -z "$CC"; then

if test -n "$ac_tool_prefix"; then

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

set dummy ${ac_tool_prefix}cc; ac_word=$2

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

if test "${ac_cv_prog_CC+set}" = set; then

- $as_echo_n "(cached) " >&6

+ echo $ECHO_N "(cached) $ECHO_C" >&6

else

if test -n "$CC"; then

ac_cv_prog_CC="$CC" # Let the user override the test.

@@ -2076,7 +1931,7 @@ do

for ac_exec_ext in '' $ac_executable_extensions; do

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

ac_cv_prog_CC="${ac_tool_prefix}cc"

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

done

@@ -2087,11 +1942,11 @@ fi

CC=$ac_cv_prog_CC

if test -n "$CC"; then

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

-$as_echo "$CC" >&6; }

+ { echo "$as_me:$LINENO: result: $CC" >&5

+echo "${ECHO_T}$CC" >&6; }

else

- { $as_echo "$as_me:$LINENO: result: no" >&5

-$as_echo "no" >&6; }

+ { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

@@ -2100,10 +1955,10 @@ fi

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

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

if test "${ac_cv_prog_CC+set}" = set; then

- $as_echo_n "(cached) " >&6

+ echo $ECHO_N "(cached) $ECHO_C" >&6

else

if test -n "$CC"; then

ac_cv_prog_CC="$CC" # Let the user override the test.

@@ -2121,7 +1976,7 @@ do

continue

ac_cv_prog_CC="cc"

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

done

@@ -2144,11 +1999,11 @@ fi

CC=$ac_cv_prog_CC

if test -n "$CC"; then

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

-$as_echo "$CC" >&6; }

+ { echo "$as_me:$LINENO: result: $CC" >&5

+echo "${ECHO_T}$CC" >&6; }

else

- { $as_echo "$as_me:$LINENO: result: no" >&5

-$as_echo "no" >&6; }

+ { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

@@ -2159,10 +2014,10 @@ if test -z "$CC"; then

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

if test "${ac_cv_prog_CC+set}" = set; then

- $as_echo_n "(cached) " >&6

+ echo $ECHO_N "(cached) $ECHO_C" >&6

else

if test -n "$CC"; then

ac_cv_prog_CC="$CC" # Let the user override the test.

@@ -2175,7 +2030,7 @@ do

for ac_exec_ext in '' $ac_executable_extensions; do

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

done

@@ -2186,11 +2041,11 @@ fi

CC=$ac_cv_prog_CC

if test -n "$CC"; then

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

-$as_echo "$CC" >&6; }

+ { echo "$as_me:$LINENO: result: $CC" >&5

+echo "${ECHO_T}$CC" >&6; }

else

- { $as_echo "$as_me:$LINENO: result: no" >&5

-$as_echo "no" >&6; }

+ { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

@@ -2203,10 +2058,10 @@ if test -z "$CC"; then

# Extract the first word of "$ac_prog", so it can be a program name with args.

set dummy $ac_prog; ac_word=$2

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

- $as_echo_n "(cached) " >&6

+ echo $ECHO_N "(cached) $ECHO_C" >&6

else

if test -n "$ac_ct_CC"; then

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

@@ -2219,7 +2074,7 @@ do

for ac_exec_ext in '' $ac_executable_extensions; do

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

ac_cv_prog_ac_ct_CC="$ac_prog"

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

done

@@ -2230,11 +2085,11 @@ fi

ac_ct_CC=$ac_cv_prog_ac_ct_CC

if test -n "$ac_ct_CC"; then

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

-$as_echo "$ac_ct_CC" >&6; }

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

+echo "${ECHO_T}$ac_ct_CC" >&6; }

else

- { $as_echo "$as_me:$LINENO: result: no" >&5

-$as_echo "no" >&6; }

+ { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

@@ -2246,10 +2101,10 @@ done