diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 85fb0d973..44ff46ab1 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.68 2002/06/22 18:51:48 stevesk Exp $ | 1 | # $Id: configure.ac,v 1.69 2002/06/24 16:26:49 stevesk Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -247,7 +247,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
247 | CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include" | 247 | CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include" |
248 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 248 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
249 | LIBS="$LIBS -los -lprot -lx -ltinfo -lm" | 249 | LIBS="$LIBS -los -lprot -lx -ltinfo -lm" |
250 | rsh_path="/usr/bin/rcmd" | ||
251 | RANLIB=true | 250 | RANLIB=true |
252 | no_dev_ptmx=1 | 251 | no_dev_ptmx=1 |
253 | AC_DEFINE(BROKEN_SYS_TERMIO_H) | 252 | AC_DEFINE(BROKEN_SYS_TERMIO_H) |
@@ -264,7 +263,6 @@ mips-sony-bsd|mips-sony-newsos4) | |||
264 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 263 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
265 | LIBS="$LIBS -lprot -lx -ltinfo -lm" | 264 | LIBS="$LIBS -lprot -lx -ltinfo -lm" |
266 | no_dev_ptmx=1 | 265 | no_dev_ptmx=1 |
267 | rsh_path="/usr/bin/rcmd" | ||
268 | AC_DEFINE(USE_PIPES) | 266 | AC_DEFINE(USE_PIPES) |
269 | AC_DEFINE(HAVE_SECUREWARE) | 267 | AC_DEFINE(HAVE_SECUREWARE) |
270 | AC_DEFINE(DISABLE_SHADOW) | 268 | AC_DEFINE(DISABLE_SHADOW) |
@@ -1790,17 +1788,6 @@ AC_ARG_WITH(afs, | |||
1790 | LIBS="$LIBS $KLIBS $K5LIBS" | 1788 | LIBS="$LIBS $KLIBS $K5LIBS" |
1791 | 1789 | ||
1792 | # Looking for programs, paths and files | 1790 | # Looking for programs, paths and files |
1793 | AC_ARG_WITH(rsh, | ||
1794 | [ --with-rsh=PATH Specify path to remote shell program ], | ||
1795 | [ | ||
1796 | if test "x$withval" != "$no" ; then | ||
1797 | rsh_path=$withval | ||
1798 | fi | ||
1799 | ], | ||
1800 | [ | ||
1801 | AC_PATH_PROG(rsh_path, rsh) | ||
1802 | ] | ||
1803 | ) | ||
1804 | 1791 | ||
1805 | PRIVSEP_PATH=/var/empty | 1792 | PRIVSEP_PATH=/var/empty |
1806 | AC_ARG_WITH(privsep-path, | 1793 | AC_ARG_WITH(privsep-path, |
@@ -1836,9 +1823,6 @@ else | |||
1836 | XAUTH_PATH=$xauth_path | 1823 | XAUTH_PATH=$xauth_path |
1837 | AC_SUBST(XAUTH_PATH) | 1824 | AC_SUBST(XAUTH_PATH) |
1838 | fi | 1825 | fi |
1839 | if test ! -z "$rsh_path" ; then | ||
1840 | AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path") | ||
1841 | fi | ||
1842 | 1826 | ||
1843 | # Check for mail directory (last resort if we cannot get it from headers) | 1827 | # Check for mail directory (last resort if we cannot get it from headers) |
1844 | if test ! -z "$MAIL" ; then | 1828 | if test ! -z "$MAIL" ; then |