2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ab18dc3b4..7d92bff91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20070910
  - (dtucker) [openbsd-compat/regress/closefromtest.c] Bug #1358: Always
    return 0 on successful test.  From David.Leonard at quest com.
+ - (tim) [configure.ac] Autoconf didn't define HAVE_LIBIAF because we
+   did a AC_CHECK_FUNCS within the AC_CHECK_LIB test.
 
 20070817
  - (dtucker) [sshd.8] Many Linux variants use a single "!" to denote locked
@@ -3188,4 +3190,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4740 2007/09/10 03:20:14 dtucker Exp $
+$Id: ChangeLog,v 1.4741 2007/09/10 23:24:17 tim Exp $
diff --git a/configure.ac b/configure.ac
index f1052b079..b06114b5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.383 2007/08/10 04:36:12 dtucker Exp $
+# $Id: configure.ac,v 1.384 2007/09/10 23:24:18 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.383 $)
+AC_REVISION($Revision: 1.384 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -2004,7 +2004,10 @@ AC_CHECK_FUNCS(SHA256_Update EVP_sha256)
 saved_LIBS="$LIBS"
 AC_CHECK_LIB(iaf, ia_openinfo, [
         LIBS="$LIBS -liaf"
-        AC_CHECK_FUNCS(set_id, [SSHDLIBS="$SSHDLIBS -liaf"])
+        AC_CHECK_FUNCS(set_id, [SSHDLIBS="$SSHDLIBS -liaf"
+                                AC_DEFINE(HAVE_LIBIAF, 1,
+                        [Define if system has libiaf that supports set_id])
+                                ])
 ])
 LIBS="$saved_LIBS"