summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-01 20:29:10 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-01 20:29:10 +1000
commit096faecdea1e39ecace0b20f4e208bd7ec33f6d2 (patch)
tree7756d6d5fefe40aab00431d47075175a5641b9a1 /configure.ac
parent0646ca6be81c4f0f619d92a4e5a041b58c79a221 (diff)
- (dtucker) [configure.ac includes.h openbsd-compat/glob.{c,h}] Explicitly
test for GLOB_NOMATCH and use our glob functions if it's not found. Stops sftp from segfaulting when attempting to get a nonexistent file on Cygwin (previous versions of OpenSSH didn't use the native glob). Partly from and tested by Corinna Vinschen.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 3aba414a2..c37d7f499 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.356 2006/08/30 17:24:41 djm Exp $ 1# $Id: configure.ac,v 1.357 2006/09/01 10:29:11 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.356 $) 18AC_REVISION($Revision: 1.357 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -982,6 +982,8 @@ AC_TRY_COMPILE(
982 ] 982 ]
983) 983)
984 984
985AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include <glob.h>])
986
985AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) 987AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
986AC_RUN_IFELSE( 988AC_RUN_IFELSE(
987 [AC_LANG_SOURCE([[ 989 [AC_LANG_SOURCE([[