RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Patch from Christos Zoulas <christos@zoulas.com> 

- Try $prefix first when looking for OpenSSL.
   - Include sys/types.h when including sys/socket.h in test programs
This commit is contained in:
Damien Miller 2000-01-17 21:40:06 +11:00
parent b284b546c0
commit 6640995be8
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS
View File

@ -8,6 +8,7 @@ Ben Taylor <bent@clark.net> - Solaris debugging and fixes
Chip Salzenberg <chip@valinux.com> - Assorted patches Chip Salzenberg <chip@valinux.com> - Assorted patches
Chris Saia <csaia@wtower.com> - SuSE packaging Chris Saia <csaia@wtower.com> - SuSE packaging
Chris, the Young One <cky@pobox.com> - Password auth fixes Chris, the Young One <cky@pobox.com> - Password auth fixes
Christos Zoulas <christos@zoulas.com> - Autoconf fixes
Chun-Chung Chen <cjj@u.washington.edu> - RPM fixes Chun-Chung Chen <cjj@u.washington.edu> - RPM fixes
Dan Brosemer <odin@linuxfreak.com> - Autoconf support, build fixes Dan Brosemer <odin@linuxfreak.com> - Autoconf support, build fixes
Darren Hall <dhall@virage.org> - AIX patches Darren Hall <dhall@virage.org> - AIX patches

3
ChangeLog
View File

@ -14,6 +14,9 @@
<jhuuskon@hytti.uku.fi> <jhuuskon@hytti.uku.fi>
- Fix hang on logout if processes are still using the pty. Needs - Fix hang on logout if processes are still using the pty. Needs
further testing. further testing.
- Patch from Christos Zoulas <christos@zoulas.com>
- Try $prefix first when looking for OpenSSL.
- Include sys/types.h when including sys/socket.h in test programs
20000116 20000116
- Renamed --with-xauth-path to --with-xauth - Renamed --with-xauth-path to --with-xauth

20
configure.in
View File

@ -96,7 +96,7 @@ esac
dnl Check for OpenSSL/SSLeay directories. dnl Check for OpenSSL/SSLeay directories.
AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
for ssldir in /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do for ssldir in $prefix /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do
if test -f "$ssldir/include/openssl/crypto.h"; then if test -f "$ssldir/include/openssl/crypto.h"; then
AC_DEFINE(HAVE_OPENSSL) AC_DEFINE(HAVE_OPENSSL)
GOT_SSL="yes" GOT_SSL="yes"
@ -246,7 +246,10 @@ AC_TRY_COMPILE(
AC_MSG_CHECKING([for struct sockaddr_storage]) AC_MSG_CHECKING([for struct sockaddr_storage])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <sys/socket.h>], [
#include <sys/types.h>
#include <sys/socket.h>
],
[struct sockaddr_storage s;], [struct sockaddr_storage s;],
[ [
AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE) AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
@ -280,6 +283,7 @@ AC_TRY_COMPILE(
AC_MSG_CHECKING([for struct addrinfo]) AC_MSG_CHECKING([for struct addrinfo])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
], ],
@ -432,7 +436,10 @@ AC_EGREP_HEADER(ut_addr_v6, utmpx.h,
AC_MSG_CHECKING([whether struct sockaddr_storage has ss_family field]) AC_MSG_CHECKING([whether struct sockaddr_storage has ss_family field])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <sys/socket.h>], [
#include <sys/types.h>
#include <sys/socket.h>
],
[struct sockaddr_storage s; s.ss_family = 1;], [struct sockaddr_storage s; s.ss_family = 1;],
[ [
AC_DEFINE(HAVE_SS_FAMILY_IN_SS) AC_DEFINE(HAVE_SS_FAMILY_IN_SS)
@ -442,7 +449,10 @@ AC_TRY_COMPILE(
) )
AC_MSG_CHECKING([whether struct sockaddr_storage has __ss_family field]) AC_MSG_CHECKING([whether struct sockaddr_storage has __ss_family field])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <sys/socket.h>], [
#include <sys/types.h>
#include <sys/socket.h>
],
[struct sockaddr_storage s; s.__ss_family = 1;], [struct sockaddr_storage s; s.__ss_family = 1;],
[ [
AC_DEFINE(HAVE___SS_FAMILY_IN_SS) AC_DEFINE(HAVE___SS_FAMILY_IN_SS)
@ -636,7 +646,7 @@ dnl Use ip address instead of hostname in $DISPLAY
AC_ARG_WITH(ipaddr-display, AC_ARG_WITH(ipaddr-display,
[ --with-ipaddr-display Use ip address instead of hostname in \$DISPLAY], [ --with-ipaddr-display Use ip address instead of hostname in \$DISPLAY],
[ [
if test "x$withval" != "xno" ; then if test "x$withval" = "xno" ; then
AC_DEFINE(IPADDR_IN_DISPLAY) AC_DEFINE(IPADDR_IN_DISPLAY)
fi fi
] ]