From db819595d35cbf23eb4eeba2ad0ac54ef7e19036 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 14 Mar 2000 13:44:01 +1100
Subject: [PATCH]  - 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

---
 ChangeLog    |  5 +++++
 configure.in | 16 ++++++++++++++--
 defines.h    |  4 ++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fff7f9c07..1aa939282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 20000314
  - Include macro for IN6_IS_ADDR_V4MAPPED. Report from 
    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
  - Detect RSAref
diff --git a/configure.in b/configure.in
index 4f1e4796e..1463748af 100644
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,8 @@ AC_SUBST(PERL)
 case "$host" in
 *-*-aix*)
 	AFS_LIBS="-lld"
+	CFLAGS="$CFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 	AC_DEFINE(BROKEN_GETADDRINFO)
 	;;
 *-*-hpux10*)
@@ -27,6 +29,8 @@ case "$host" in
 		CFLAGS="$CFLAGS -Aa"
 	fi
 	CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+	CFLAGS="$CFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 	AC_DEFINE(IPADDR_IN_DISPLAY)
 	AC_DEFINE(USE_UTMPX)
 	AC_MSG_CHECKING(for HPUX trusted system password database)
@@ -43,11 +47,15 @@ case "$host" in
 	mansubdir=cat
 	;;
 *-*-irix5*)
+	CFLAGS="$CFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 	MANTYPE='$(CATMAN)'
 	no_libsocket=1
 	no_libnsl=1
 	;;
 *-*-irix6*)
+	CFLAGS="$CFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 	MANTYPE='$(CATMAN)'
 	AC_MSG_WARN([*** Irix 6.x is not tested, please report you experiences *** ])
 	no_libsocket=1
@@ -62,11 +70,15 @@ case "$host" in
 	need_dash_r=1
 	;;
 *-*-solaris*)
+	CFLAGS="$CFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
 	need_dash_r=1
-	LDFLAGS="-L/usr/ucblib"
+	LDFLAGS="-L/usr/ucblib -R/usr/ucblib"
 	AC_DEFINE(USE_UTMPX)
 	;;
 *-*-sysv*)
+	CFLAGS="$CFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 	AC_DEFINE(USE_UTMPX)
 	MANTYPE='$(CATMAN)'
 	mansubdir=cat
@@ -220,7 +232,7 @@ else
 	fi
 fi
 LIBS="$saved_LIBS -lcrypto"
-if test ! -z $WANTS_RSAREF ; then
+if test ! -z "$WANTS_RSAREF" ; then
 	LIBS="$LIBS -lRSAglue -lrsaref"
 fi
 AC_MSG_RESULT($ssldir)
diff --git a/defines.h b/defines.h
index 48e14fd25..831fbaa9e 100644
--- a/defines.h
+++ b/defines.h
@@ -239,8 +239,8 @@ typedef unsigned int size_t;
 
 #if !defined(IN6_IS_ADDR_V4MAPPED)
 # define IN6_IS_ADDR_V4MAPPED(a) \
-	((((uint32_t *) (a))[0] == 0) && (((uint32_t *) (a))[1] == 0) && \
-	 (((uint32_t *) (a))[2] == htonl (0xffff)))
+	((((u_int32_t *) (a))[0] == 0) && (((u_int32_t *) (a))[1] == 0) && \
+	 (((u_int32_t *) (a))[2] == htonl (0xffff)))
 #endif /* !defined(IN6_IS_ADDR_V4MAPPED) */
 
 #if !defined(__GNUC__) || (__GNUC__ < 2)