Commit 3cff265f authored by Niels Möller's avatar Niels Möller

* configure.in: Commented out the sshd1 related tests.

* configure.in: Check for openpty(). Test for BSD style pty names.

Rev: configure.in:1.3
parent 8a8d614a
......@@ -49,10 +49,18 @@ dnl Checking this variable is delayed until we have checked if zlib is
dnl actually available.
AC_ARG_WITH(sshd1,
[--with-sshd1[=PROGRAM] support fallback to SSH1 daemon (broken)])
[--with-sshd1[=PROGRAM] support fallback to SSH1 daemon.],,
[with_sshd1=yes])
dnl Checking this variable is delayed until we have checked if an SSH1
dnl server is actually available.
# Default sshd1 path
if test x$with_sshd1 = xyes ; then
with_sshd1=/usr/local/sbin/sshd1
fi
if test x$with_sshd1 != xno ; then
AC_DEFINE(WITH_SSH1_FALLBACK)
AC_DEFINE_UNQUOTED(SSHD1,"$with_sshd1")
fi
AC_ARG_WITH(idea,
[--with-idea support the patent-encumbered IDEA algorithm],,
......@@ -113,45 +121,45 @@ if test x$with_zlib = xyes ; then
fi
dnl Find the SSH1 daemon; try 'sshd1' first; if it fails, look for 'sshd'
if test x$with_sshd1 = xyes ; then
AC_DEFINE(SSH1_FALLBACK)
dnl We have to provide an additional path: regular users seldomly have
dnl the sbin directories in their $PATH.
AC_PATH_PROG(SSHD1BIN, sshd1, [],
$PATH:/usr/local/sbin:/usr/local/etc:/usr/sbin:/usr/etc:/sbin:/etc)
if test x$SSHD1BIN = x ; then
AC_PATH_PROG(SSHD1BIN, sshd, [],
$PATH:/usr/local/sbin:/usr/local/etc:/usr/sbin:/usr/etc:/sbin:/etc)
fi
if test x$SSHD1BIN = x ; then
AC_MSG_ERROR([
You requested SSH1 fallback support (--with-sshd1), but no sshd1 could be found.
You can
- supply the location of sshd1, i.e. --with-sshd1=/home/foo/sbin/sshd ,
- install sshd1 (ftp://ftp.cs.hut.fi/pub/ssh/); note that it is not free
software, or
- configure --without-sshd1 .
])
fi
dnl OK. We've found an SSH1 daemon. Now we need to make sure it is
dnl recent enough to be used as a fallback daemon. This means it has to
dnl support the -V option, which tells it not to read the client version
dnl string as lshd has already done that, and which supplies that version
dnl string.
AC_MSG_CHECKING(if $SSHD1BIN has the -V compatibility flag)
changequote(<<, >>)dnl
if ($SSHD1BIN -h 2>&1 ; true) | grep '^[ \t]*-V' > /dev/null ; then
changequote([, ])dnl
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([
Found SSH1 daemon ]$SSHD1BIN[, but it does not support the -V option.
This means we cannot use it as a fallback daemon. Please install a more recent
SSH1 daemon (ftp://ftp.cs.hut.fi/pub/ssh/), or configure --without-sshd1 .])
fi
AC_DEFINE_UNQUOTED(SSHD1,"$SSHD1BIN")
fi
dnl ## if test x$with_sshd1 = xyes ; then
dnl ## AC_DEFINE(SSH1_FALLBACK)
dnl ## dnl We have to provide an additional path: regular users seldomly have
dnl ## dnl the sbin directories in their $PATH.
dnl ## AC_PATH_PROG(SSHD1BIN, sshd1, [],
dnl ## $PATH:/usr/local/sbin:/usr/local/etc:/usr/sbin:/usr/etc:/sbin:/etc)
dnl ## if test x$SSHD1BIN = x ; then
dnl ## AC_PATH_PROG(SSHD1BIN, sshd, [],
dnl ## $PATH:/usr/local/sbin:/usr/local/etc:/usr/sbin:/usr/etc:/sbin:/etc)
dnl ## fi
dnl ## if test x$SSHD1BIN = x ; then
dnl ## AC_MSG_ERROR([
dnl ## You requested SSH1 fallback support (--with-sshd1), but no sshd1 could be found.
dnl ## You can
dnl ## - supply the location of sshd1, i.e. --with-sshd1=/home/foo/sbin/sshd ,
dnl ## - install sshd1 (ftp://ftp.cs.hut.fi/pub/ssh/); note that it is not free
dnl ## software, or
dnl ## - configure --without-sshd1 .
dnl ## ])
dnl ## fi
dnl ##
dnl ## dnl OK. We've found an SSH1 daemon. Now we need to make sure it is
dnl ## dnl recent enough to be used as a fallback daemon. This means it has to
dnl ## dnl support the -V option, which tells it not to read the client version
dnl ## dnl string as lshd has already done that, and which supplies that version
dnl ## dnl string.
dnl ## AC_MSG_CHECKING(if $SSHD1BIN has the -V compatibility flag)
dnl ## changequote(<<, >>)dnl
dnl ## if ($SSHD1BIN -h 2>&1 ; true) | grep '^[ \t]*-V' > /dev/null ; then
dnl ## changequote([, ])dnl
dnl ## AC_MSG_RESULT(yes)
dnl ## else
dnl ## AC_MSG_ERROR([
dnl ## Found SSH1 daemon ]$SSHD1BIN[, but it does not support the -V option.
dnl ## This means we cannot use it as a fallback daemon. Please install a more recent
dnl ## SSH1 daemon (ftp://ftp.cs.hut.fi/pub/ssh/), or configure --without-sshd1 .])
dnl ## fi
dnl ## AC_DEFINE_UNQUOTED(SSHD1,"$SSHD1BIN")
dnl ## fi
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
......@@ -171,7 +179,7 @@ AC_FUNC_VPRINTF
AC_CHECK_FUNCS(select socket strerror strtol)
AC_CHECK_FUNCS(getspnam)
AC_CHECK_FUNCS(vsnprintf inet_aton)
AC_CHECK_FUNCS(openpty)
AC_CHECK_FUNCS(poll,,[LIBOBJS="jpoll.o $LIBOBJS"])
dnl This macro is mentioned in the automake manual, but where is it
......@@ -282,6 +290,12 @@ if test "$lsh_cv_c_attribute" = "yes"; then
AC_DEFINE(HAVE_ATTRIBUTE)
fi
AC_MSG_CHECKING(for BSD pty names)
AC_DEFINE_UNQUOTED(PTY_BSD_SCHEME_FIRST_CHARS, "`ls /dev/pty* | cut -c 9-9 | uniq | tr -d '\n'`")
AC_DEFINE_UNQUOTED(PTY_BSD_SCHEME_SECOND_CHARS, "`ls /dev/pty* | cut -c 10-10 | sort | uniq | tr -d '\n'`")
AC_DEFINE(PTY_BSD_SCHEME)
AC_MSG_RESULT([done])
# Set these flags *last*, or else the test programs won't compile
if test x$GCC = xyes ; then
CFLAGS="$CFLAGS -Wall -W \
......
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