summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-02-16 12:05:39 +1100
committerDamien Miller <djm@mindrot.org>2001-02-16 12:05:39 +1100
commit5dfe976cdfbc5703dfbbd0783f1328be0007eca3 (patch)
treefd9f1b0e868fcfad99d0167fed1e9403a223173a
parentb5e85a5d943462e81a4649617e87b7a76c645c1e (diff)
- (djm) USE_PIPES for a few more sysv platforms
- (djm) Cleanup configure.in a little - (djm) Ask users to check config.log when we can't find necessary libs
-rw-r--r--ChangeLog5
-rw-r--r--configure.in22
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 55ec667d..e389cfc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
Nalin Dahyabhai <nalin@redhat.com>
- (djm) BSD license for gnome-ssh-askpass (was X11)
- (djm) KNF on gnome-ssh-askpass
+ - (djm) USE_PIPES for a few more sysv platforms
+ - (djm) Cleanup configure.in a little
+ - (djm) Ask users to check config.log when we can't find necessary libs
20010215
- (djm) Move PAM session setup back to before setuid to user. Fixes
@@ -3981,4 +3984,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.776 2001/02/16 00:18:58 djm Exp $
+$Id: ChangeLog,v 1.777 2001/02/16 01:05:39 djm Exp $
diff --git a/configure.in b/configure.in
index 84198485..ac9a456a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.241 2001/02/15 23:18:12 djm Exp $
+# $Id: configure.in,v 1.242 2001/02/16 01:05:39 djm Exp $
AC_INIT(ssh.c)
@@ -137,7 +137,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(HAVE_NEWS4)
SONY=1
AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT),
- AC_MSG_ERROR([*** libiberty missing - please install first ***])
+ AC_MSG_ERROR([*** libiberty missing - please install first or check config.log ***])
)
;;
*-*-netbsd*)
@@ -205,6 +205,7 @@ mips-sony-bsd|mips-sony-newsos4)
MANTYPE='$(CATMAN)'
mansubdir=cat
enable_suid_ssh=no
+ AC_DEFINE(USE_PIPES)
;;
*-*-sysv5*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -212,6 +213,7 @@ mips-sony-bsd|mips-sony-newsos4)
MANTYPE='$(CATMAN)'
mansubdir=cat
enable_suid_ssh=no
+ AC_DEFINE(USE_PIPES)
;;
*-*-sysv*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -221,29 +223,29 @@ mips-sony-bsd|mips-sony-newsos4)
LIBS="$LIBS -lgen -lsocket"
;;
*-*-sco3.2v4*)
- AC_DEFINE(USE_PIPES)
CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)'
- mansubdir=cat
LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
- no_dev_ptmx=1
+ mansubdir=cat
+ rsh_path="/usr/bin/rcmd"
RANLIB=true
+ no_dev_ptmx=1
AC_DEFINE(BROKEN_SYS_TERMIO_H)
- rsh_path="/usr/bin/rcmd"
+ AC_DEFINE(USE_PIPES)
AC_DEFINE(HAVE_SCO_PROTECTED_PW)
AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
;;
*-*-sco3.2v5*)
- AC_DEFINE(USE_PIPES)
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ LIBS="$LIBS -lprot -lx -ltinfo -lm"
MANTYPE='$(CATMAN)'
mansubdir=cat
- LIBS="$LIBS -lprot -lx -ltinfo -lm"
no_dev_ptmx=1
rsh_path="/usr/bin/rcmd"
+ AC_DEFINE(USE_PIPES)
AC_DEFINE(HAVE_SCO_PROTECTED_PW)
AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
@@ -322,7 +324,7 @@ if test -z "$no_libnsl" ; then
fi
AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")
-AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
+AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***]))
AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
# We don't want to check if we did an pcre override.
@@ -626,7 +628,7 @@ int main(void)
done
if test -z "$found_crypto" ; then
- AC_MSG_ERROR([Could not find working SSLeay / OpenSSL libraries, please install])
+ AC_MSG_ERROR([Could not find working OpenSSL library, please install or check config.log])
fi
if test -z "$ssldir" ; then
ssldir="(system)"