Index: head/crypto/openssh/freebsd-configure.sh
===================================================================
--- head/crypto/openssh/freebsd-configure.sh	(revision 294493)
+++ head/crypto/openssh/freebsd-configure.sh	(revision 294494)
@@ -1,38 +1,44 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 configure_args="
     --prefix=/usr
     --sysconfdir=/etc/ssh
     --with-pam
+    --with-ssl-dir=/usr
     --with-tcp-wrappers
     --with-libedit
     --with-ssl-engine
     --without-xauth
 " 
 
 set -e
 
 # make sure configure uses the correct compiler
 export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC)
 export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP)
+unset CFLAGS CPPFLAGS LDFLAGS LIBS
 
 # regenerate configure and config.h.in
 autoheader
 autoconf
+
+# reset PATH to avoid picking up the wrong libraries
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+unset LD_LIBRARY_PATH
 
 # generate config.h with krb5 and stash it
 sh configure $configure_args --with-kerberos5
 mv config.log config.log.orig
 mv config.h config.h.orig
 
 # generate config.h without krb5
 sh configure $configure_args --without-kerberos5
 
 # extract the difference
 echo '/* $Free''BSD$ */' > krb5_config.h
 diff -u config.h.orig config.h |
 	sed -n '/^-#define/s/^-//p' |
 	grep -Ff /dev/stdin config.h.orig >> krb5_config.h