summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
committerColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
commitf38224d546cdde55f45c13d3d8225d273a3f920e (patch)
treea91a26b88ac90dc72d0ea3767feabb341eaa50a8 /aclocal.m4
parent338146a3fc257e216fe5c10fe40e6896b40d7739 (diff)
parente90790abaf031e037f444a6658e136e48577ea49 (diff)
merge 5.9p1
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m430
1 files changed, 19 insertions, 11 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index b68a47080..9bdea5ec2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,26 @@
1dnl $Id: aclocal.m4,v 1.6 2005/09/19 16:33:39 tim Exp $ 1dnl $Id: aclocal.m4,v 1.8 2011/05/20 01:45:25 djm Exp $
2dnl 2dnl
3dnl OpenSSH-specific autoconf macros 3dnl OpenSSH-specific autoconf macros
4dnl 4dnl
5 5
6dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag])
7dnl Check that $CC accepts a flag 'check_flag'. If it is supported append
8dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
9dnl 'check_flag'.
10AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
11 AC_MSG_CHECKING([if $CC supports $1])
12 saved_CFLAGS="$CFLAGS"
13 CFLAGS="$CFLAGS $1"
14 _define_flag="$2"
15 test "x$_define_flag" = "x" && _define_flag="$1"
16 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
17 [ AC_MSG_RESULT([yes])
18 CFLAGS="$saved_CFLAGS $_define_flag"],
19 [ AC_MSG_RESULT([no])
20 CFLAGS="$saved_CFLAGS" ]
21 )
22}])
23
6 24
7dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol) 25dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
8dnl Does AC_EGREP_HEADER on 'header' for the string 'field' 26dnl Does AC_EGREP_HEADER on 'header' for the string 'field'
@@ -33,16 +51,6 @@ AC_DEFUN(OSSH_CHECK_HEADER_FOR_FIELD, [
33 fi 51 fi
34]) 52])
35 53
36dnl OSSH_PATH_ENTROPY_PROG(variablename, command):
37dnl Tidiness function, sets 'undef' if not found, and does the AC_SUBST
38AC_DEFUN(OSSH_PATH_ENTROPY_PROG, [
39 AC_PATH_PROG($1, $2)
40 if test -z "[$]$1" ; then
41 $1="undef"
42 fi
43 AC_SUBST($1)
44])
45
46dnl Check for socklen_t: historically on BSD it is an int, and in 54dnl Check for socklen_t: historically on BSD it is an int, and in
47dnl POSIX 1g it is a type of its own, but some platforms use different 55dnl POSIX 1g it is a type of its own, but some platforms use different
48dnl types for the argument to getsockopt, getpeername, etc. So we 56dnl types for the argument to getsockopt, getpeername, etc. So we