summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-03-15 21:31:39 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-03-15 21:31:39 +1100
commit486d95e6f78e7b27bbdc932ee6fdce0d28b2f8d9 (patch)
tree9eca8503bef252539c701f7e05cd50e08f0cb008
parent4b23f7c660efee1b4158b6a9fa0197ff9f8f6692 (diff)
- (dtucker) [configure.ac] Fix glob test conversion to AC_TRY_COMPILE
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c0a0a4ebe..0141c327c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -267,6 +267,7 @@
267 - (tim) [includes.h] put sys/stat.h back in to quiet some "macro redefined:" 267 - (tim) [includes.h] put sys/stat.h back in to quiet some "macro redefined:"
268 - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some 268 - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some
269 includes removed from includes.h 269 includes removed from includes.h
270 - (dtucker) [configure.ac] Fix glob test conversion to AC_TRY_COMPILE
270 271
27120060313 27220060313
272 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 273 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4168,4 +4169,4 @@
4168 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4169 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4169 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4170 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4170 4171
4171$Id: ChangeLog,v 1.4220 2006/03/15 06:09:50 tim Exp $ 4172$Id: ChangeLog,v 1.4221 2006/03/15 10:31:39 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index fc54f3b54..72577a728 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.335 2006/03/15 02:12:41 djm Exp $ 1# $Id: configure.ac,v 1.336 2006/03/15 10:31:39 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.335 $) 18AC_REVISION($Revision: 1.336 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -924,7 +924,7 @@ AC_EGREP_CPP(FOUNDIT,
924 924
925# Check for g.gl_matchc glob() extension 925# Check for g.gl_matchc glob() extension
926AC_MSG_CHECKING(for gl_matchc field in glob_t) 926AC_MSG_CHECKING(for gl_matchc field in glob_t)
927AC_TRY_COMPILE(FOUNDIT, 927AC_TRY_COMPILE(
928 [ #include <glob.h> ], 928 [ #include <glob.h> ],
929 [glob_t g; g.gl_matchc = 1;], 929 [glob_t g; g.gl_matchc = 1;],
930 [ 930 [