2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8943f0e96..e99ae9d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20060203
+ - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first
+   AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run
+   by a platform specific check, builtin standard includes tests will be
+   skipped on the other platforms.
+   Analysis and suggestion by vinschen at redhat.com, patch by dtucker@.
+   OK tim@, djm@.
+
 20060202
  - (dtucker) [configure.ac] Bug #1148: Fix "crippled AES" test so that it
    works with picky compilers.  Patch from alex.kiernan at thus.net.
@@ -3822,4 +3830,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4119 2006/02/02 07:44:19 dtucker Exp $
+$Id: ChangeLog,v 1.4120 2006/02/03 03:11:56 tim Exp $
diff --git a/configure.ac b/configure.ac
index 6b5ec8636..fe034aca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.323 2006/02/02 07:44:19 dtucker Exp $
+# $Id: configure.ac,v 1.324 2006/02/03 03:11:56 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -27,6 +27,7 @@ AC_PROG_AWK
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
+AC_PROG_EGREP
 AC_PATH_PROG(AR, ar)
 AC_PATH_PROG(CAT, cat)
 AC_PATH_PROG(KILL, kill)