summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-01-21 12:50:46 +1100
committerDarren Tucker <dtucker@zip.com.au>2014-01-21 12:50:46 +1100
commita6d573caa14d490e6c42fb991bcb5c6860ec704b (patch)
tree2f44ef5989d110f2eb9c037f56e16fde8da6a29f
parent096118dc73ab14810b3c12785c0b5acb01ad6123 (diff)
- (dtucker) [aclocal.m4] Differentiate between compile-time and link-time
tests in the configure output. ok djm.
-rw-r--r--ChangeLog2
-rw-r--r--aclocal.m46
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cbbab53a6..9ebe5a639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 to on platforms where it's known to be reliably detected and off elsewhere. 3 to on platforms where it's known to be reliably detected and off elsewhere.
4 Works around platforms such as FreeBSD 9.1 where it does not interop with 4 Works around platforms such as FreeBSD 9.1 where it does not interop with
5 -ftrapv (it seems to work but fails when trying to link ssh). ok djm@ 5 -ftrapv (it seems to work but fails when trying to link ssh). ok djm@
6 - (dtucker) [aclocal.m4] Differentiate between compile-time and link-time
7 tests in the configure output. ok djm.
6 8
720140120 920140120
8 - (dtucker) [gss-serv-krb5.c] Fall back to krb5_cc_gen_new if the Kerberos 10 - (dtucker) [gss-serv-krb5.c] Fall back to krb5_cc_gen_new if the Kerberos
diff --git a/aclocal.m4 b/aclocal.m4
index b1648e4e7..ce679648d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
1dnl $Id: aclocal.m4,v 1.10 2014/01/16 22:53:24 dtucker Exp $ 1dnl $Id: aclocal.m4,v 1.11 2014/01/21 01:50:46 dtucker Exp $
2dnl 2dnl
3dnl OpenSSH-specific autoconf macros 3dnl OpenSSH-specific autoconf macros
4dnl 4dnl
@@ -8,7 +8,7 @@ dnl 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 8dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
9dnl 'check_flag'. 9dnl 'check_flag'.
10AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ 10AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
11 AC_MSG_CHECKING([if $CC supports $1]) 11 AC_MSG_CHECKING([if $CC supports compile flag $1])
12 saved_CFLAGS="$CFLAGS" 12 saved_CFLAGS="$CFLAGS"
13 CFLAGS="$CFLAGS $WERROR $1" 13 CFLAGS="$CFLAGS $WERROR $1"
14 _define_flag="$2" 14 _define_flag="$2"
@@ -33,7 +33,7 @@ dnl Check that $LD accepts a flag 'check_flag'. If it is supported append
33dnl 'define_flag' to $LDFLAGS. If 'define_flag' is not specified, then append 33dnl 'define_flag' to $LDFLAGS. If 'define_flag' is not specified, then append
34dnl 'check_flag'. 34dnl 'check_flag'.
35AC_DEFUN([OSSH_CHECK_LDFLAG_LINK], [{ 35AC_DEFUN([OSSH_CHECK_LDFLAG_LINK], [{
36 AC_MSG_CHECKING([if $LD supports $1]) 36 AC_MSG_CHECKING([if $LD supports link flag $1])
37 saved_LDFLAGS="$LDFLAGS" 37 saved_LDFLAGS="$LDFLAGS"
38 LDFLAGS="$LDFLAGS $WERROR $1" 38 LDFLAGS="$LDFLAGS $WERROR $1"
39 _define_flag="$2" 39 _define_flag="$2"