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

- Include /usr/local/include and /usr/local/lib for systems that don't 

do it themselves
 - -R/usr/local/lib for Solaris
 - Fix RSAref detection
 - Fix IN6_IS_ADDR_V4MAPPED macro
This commit is contained in:
Damien Miller 2000-03-14 13:44:01 +11:00
parent 1c67c9969c
commit db819595d3
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,11 @@
20000314 20000314
- Include macro for IN6_IS_ADDR_V4MAPPED. Report from - Include macro for IN6_IS_ADDR_V4MAPPED. Report from
peter@frontierflying.com peter@frontierflying.com
- Include /usr/local/include and /usr/local/lib for systems that don't
do it themselves
- -R/usr/local/lib for Solaris
- Fix RSAref detection
- Fix IN6_IS_ADDR_V4MAPPED macro
20000311 20000311
- Detect RSAref - Detect RSAref

16
configure.in
View File

@ -20,6 +20,8 @@ AC_SUBST(PERL)
case "$host" in case "$host" in
*-*-aix*) *-*-aix*)
AFS_LIBS="-lld" AFS_LIBS="-lld"
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_DEFINE(BROKEN_GETADDRINFO) AC_DEFINE(BROKEN_GETADDRINFO)
;; ;;
*-*-hpux10*) *-*-hpux10*)
@ -27,6 +29,8 @@ case "$host" in
CFLAGS="$CFLAGS -Aa" CFLAGS="$CFLAGS -Aa"
fi fi
CFLAGS="$CFLAGS -D_HPUX_SOURCE" CFLAGS="$CFLAGS -D_HPUX_SOURCE"
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_DEFINE(IPADDR_IN_DISPLAY) AC_DEFINE(IPADDR_IN_DISPLAY)
AC_DEFINE(USE_UTMPX) AC_DEFINE(USE_UTMPX)
AC_MSG_CHECKING(for HPUX trusted system password database) AC_MSG_CHECKING(for HPUX trusted system password database)
@ -43,11 +47,15 @@ case "$host" in
mansubdir=cat mansubdir=cat
;; ;;
*-*-irix5*) *-*-irix5*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
no_libsocket=1 no_libsocket=1
no_libnsl=1 no_libnsl=1
;; ;;
*-*-irix6*) *-*-irix6*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
AC_MSG_WARN([*** Irix 6.x is not tested, please report you experiences *** ]) AC_MSG_WARN([*** Irix 6.x is not tested, please report you experiences *** ])
no_libsocket=1 no_libsocket=1
@ -62,11 +70,15 @@ case "$host" in
need_dash_r=1 need_dash_r=1
;; ;;
*-*-solaris*) *-*-solaris*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
need_dash_r=1 need_dash_r=1
LDFLAGS="-L/usr/ucblib" LDFLAGS="-L/usr/ucblib -R/usr/ucblib"
AC_DEFINE(USE_UTMPX) AC_DEFINE(USE_UTMPX)
;; ;;
*-*-sysv*) *-*-sysv*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_DEFINE(USE_UTMPX) AC_DEFINE(USE_UTMPX)
MANTYPE='$(CATMAN)' MANTYPE='$(CATMAN)'
mansubdir=cat mansubdir=cat
@ -220,7 +232,7 @@ else
fi fi
fi fi
LIBS="$saved_LIBS -lcrypto" LIBS="$saved_LIBS -lcrypto"
if test ! -z $WANTS_RSAREF ; then if test ! -z "$WANTS_RSAREF" ; then
LIBS="$LIBS -lRSAglue -lrsaref" LIBS="$LIBS -lRSAglue -lrsaref"
fi fi
AC_MSG_RESULT($ssldir) AC_MSG_RESULT($ssldir)

4
defines.h
View File

@ -239,8 +239,8 @@ typedef unsigned int size_t;
#if !defined(IN6_IS_ADDR_V4MAPPED) #if !defined(IN6_IS_ADDR_V4MAPPED)
# define IN6_IS_ADDR_V4MAPPED(a) \ # define IN6_IS_ADDR_V4MAPPED(a) \
((((uint32_t *) (a))[0] == 0) && (((uint32_t *) (a))[1] == 0) && \ ((((u_int32_t *) (a))[0] == 0) && (((u_int32_t *) (a))[1] == 0) && \
(((uint32_t *) (a))[2] == htonl (0xffff))) (((u_int32_t *) (a))[2] == htonl (0xffff)))
#endif /* !defined(IN6_IS_ADDR_V4MAPPED) */ #endif /* !defined(IN6_IS_ADDR_V4MAPPED) */
#if !defined(__GNUC__) || (__GNUC__ < 2) #if !defined(__GNUC__) || (__GNUC__ < 2)