summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2006-02-02 19:11:56 -0800
committerTim Rice <tim@multitalents.net>2006-02-02 19:11:56 -0800
commitfd80ddcb2349e2ac28f4fc6f682c20c8d1dc06ad (patch)
tree2c1e1a5f9d932aebafc6c7975e7394a6d228a5a8
parentcc7c212830e3f5adabe1996e6b498f01e963cfee (diff)
- (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@.
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac3
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 @@
120060203
2 - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first
3 AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run
4 by a platform specific check, builtin standard includes tests will be
5 skipped on the other platforms.
6 Analysis and suggestion by vinschen at redhat.com, patch by dtucker@.
7 OK tim@, djm@.
8
120060202 920060202
2 - (dtucker) [configure.ac] Bug #1148: Fix "crippled AES" test so that it 10 - (dtucker) [configure.ac] Bug #1148: Fix "crippled AES" test so that it
3 works with picky compilers. Patch from alex.kiernan at thus.net. 11 works with picky compilers. Patch from alex.kiernan at thus.net.
@@ -3822,4 +3830,4 @@
3822 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3830 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3823 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3831 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3824 3832
3825$Id: ChangeLog,v 1.4119 2006/02/02 07:44:19 dtucker Exp $ 3833$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 @@
1# $Id: configure.ac,v 1.323 2006/02/02 07:44:19 dtucker Exp $ 1# $Id: configure.ac,v 1.324 2006/02/03 03:11:56 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -27,6 +27,7 @@ AC_PROG_AWK
27AC_PROG_CPP 27AC_PROG_CPP
28AC_PROG_RANLIB 28AC_PROG_RANLIB
29AC_PROG_INSTALL 29AC_PROG_INSTALL
30AC_PROG_EGREP
30AC_PATH_PROG(AR, ar) 31AC_PATH_PROG(AR, ar)
31AC_PATH_PROG(CAT, cat) 32AC_PATH_PROG(CAT, cat)
32AC_PATH_PROG(KILL, kill) 33AC_PATH_PROG(KILL, kill)