$NetBSD: patch-ab,v 1.8 2002/04/02 11:20:13 seb Exp $

--- configure.ac.orig	Sat Nov  3 20:09:33 2001
+++ configure.ac
@@ -150,8 +150,6 @@
 	CFLAGS="$CFLAGS"
 	;;
 *-*-solaris*)
-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
 	need_dash_r=1
 	AC_DEFINE(PAM_SUN_CODEBASE)
 	AC_DEFINE(LOGIN_NEEDS_UTMPX)
@@ -283,6 +281,9 @@
 	;;
 esac
 
+# pkgsrc handles any rpath settings this package needs
+need_dash_r=
+
 # Allow user to specify flags
 AC_ARG_WITH(cflags,
 	[  --with-cflags           Specify additional flags to pass to compiler],
@@ -550,6 +551,10 @@
 			AC_MSG_CHECKING(for libwrap)
 			AC_TRY_LINK(
 				[
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+#include <stdio.h>
 #include <tcpd.h>
 					int deny_severity = 0, allow_severity = 0;
 				],
@@ -558,14 +563,18 @@
 					AC_MSG_RESULT(yes)
 					AC_DEFINE(LIBWRAP)
 					TCPW_MSG="yes"
+					TCPW_LIB="-lwrap"
 				],
 				[
+					TCPW_LIB=""
 					AC_MSG_ERROR([*** libwrap missing])
 				]
 			)
+			LIBS="$saved_LIBS"
 		fi
 	]
 )
+AC_SUBST(TCPW_LIB)
 
 dnl    Checks for library functions.
 AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa \
@@ -2194,7 +2203,7 @@
 echo "                 User binaries: $B"
 echo "               System binaries: $C"
 echo "           Configuration files: $D"
-echo "               Askpass program: $E"
+echo "               Askpass program: ${ASKPASS_PROGRAM}"
 echo "                  Manual pages: $F"
 echo "                      PID file: $G"
 echo "        sshd default user PATH: $H"
