$NetBSD: patch-ab,v 1.26 2009/05/21 03:22:29 taca Exp $

--- configure.ac.orig	2009-02-16 13:37:03.000000000 +0900
+++ configure.ac
@@ -191,6 +191,9 @@ AC_ARG_WITH(rpath,
 	]
 )
 
+# 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],
@@ -258,6 +261,7 @@ AC_CHECK_HEADERS( \
 	maillock.h \
 	ndir.h \
 	net/if_tun.h \
+	net/tun/if_tun.h \
 	netdb.h \
 	netgroup.h \
 	pam/pam_appl.h \
@@ -531,6 +535,15 @@ main() { if (NSVersionOfRunTimeLibrary("
 		;;
 	esac
 	;;
+*-*-interix3*)
+        AC_DEFINE(HAVE_INTERIX)
+        AC_DEFINE(DISABLE_FD_PASSING)
+        AC_DEFINE(DISABLE_SHADOW)
+        AC_DEFINE(IP_TOS_IS_BROKEN)
+        AC_DEFINE(MISSING_HOWMANY)
+        AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
+        AC_DEFINE(USE_PIPES)
+        ;;
 *-*-irix5*)
 	PATH="$PATH:/usr/etc"
 	AC_DEFINE(BROKEN_INET_NTOA, 1,
@@ -4063,9 +4076,17 @@ AC_TRY_COMPILE([
 )
 if test -z "$conf_utmpx_location"; then
 	if test x"$system_utmpx_path" = x"no" ; then
-		AC_DEFINE(DISABLE_UTMPX)
+		for f in /var/run/utmpx; do
+			if test -f $f ; then
+				conf_utmpx_location=$f
+			fi
+		done
+		if test -z "$conf_utmpx_location"; then
+			AC_DEFINE(DISABLE_UTMPX)
+		fi
 	fi
-else
+fi
+if test -n "$conf_utmpx_location"; then
 	AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location",
 		[Define if you want to specify the path to your utmpx file])
 fi
@@ -4089,9 +4110,17 @@ AC_TRY_COMPILE([
 )
 if test -z "$conf_wtmpx_location"; then
 	if test x"$system_wtmpx_path" = x"no" ; then
-		AC_DEFINE(DISABLE_WTMPX)
+		for f in /var/log/wtmpx; do
+			if test -f $f ; then
+				conf_wtmpx_location=$f
+			fi
+		done
+		if test -z "$conf_wtmpx_location"; then
+			AC_DEFINE(DISABLE_WTMPX)
+		fi
 	fi
-else
+fi
+if test -n "$conf_wtmpx_location"; then
 	AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location",
 		[Define if you want to specify the path to your wtmpx file])
 fi
@@ -4138,7 +4167,7 @@ echo "OpenSSH has been configured with t
 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 "  Privilege separation chroot path: $H"