- (dtucker) [aclocal.m4] Differentiate between compile-time and link-time

tests in the configure output.  ok djm.
This commit is contained in:
Darren Tucker 2014-01-21 12:50:46 +11:00
parent 096118dc73
commit a6d573caa1
2 changed files with 5 additions and 3 deletions

View File

@ -3,6 +3,8 @@
to on platforms where it's known to be reliably detected and off elsewhere. to on platforms where it's known to be reliably detected and off elsewhere.
Works around platforms such as FreeBSD 9.1 where it does not interop with Works around platforms such as FreeBSD 9.1 where it does not interop with
-ftrapv (it seems to work but fails when trying to link ssh). ok djm@ -ftrapv (it seems to work but fails when trying to link ssh). ok djm@
- (dtucker) [aclocal.m4] Differentiate between compile-time and link-time
tests in the configure output. ok djm.
20140120 20140120
- (dtucker) [gss-serv-krb5.c] Fall back to krb5_cc_gen_new if the Kerberos - (dtucker) [gss-serv-krb5.c] Fall back to krb5_cc_gen_new if the Kerberos

6
aclocal.m4 vendored
View File

@ -1,4 +1,4 @@
dnl $Id: aclocal.m4,v 1.10 2014/01/16 22:53:24 dtucker Exp $ dnl $Id: aclocal.m4,v 1.11 2014/01/21 01:50:46 dtucker Exp $
dnl dnl
dnl OpenSSH-specific autoconf macros dnl OpenSSH-specific autoconf macros
dnl dnl
@ -8,7 +8,7 @@ dnl Check that $CC accepts a flag 'check_flag'. If it is supported append
dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
dnl 'check_flag'. dnl 'check_flag'.
AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
AC_MSG_CHECKING([if $CC supports $1]) AC_MSG_CHECKING([if $CC supports compile flag $1])
saved_CFLAGS="$CFLAGS" saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $WERROR $1" CFLAGS="$CFLAGS $WERROR $1"
_define_flag="$2" _define_flag="$2"
@ -33,7 +33,7 @@ dnl Check that $LD accepts a flag 'check_flag'. If it is supported append
dnl 'define_flag' to $LDFLAGS. If 'define_flag' is not specified, then append dnl 'define_flag' to $LDFLAGS. If 'define_flag' is not specified, then append
dnl 'check_flag'. dnl 'check_flag'.
AC_DEFUN([OSSH_CHECK_LDFLAG_LINK], [{ AC_DEFUN([OSSH_CHECK_LDFLAG_LINK], [{
AC_MSG_CHECKING([if $LD supports $1]) AC_MSG_CHECKING([if $LD supports link flag $1])
saved_LDFLAGS="$LDFLAGS" saved_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $WERROR $1" LDFLAGS="$LDFLAGS $WERROR $1"
_define_flag="$2" _define_flag="$2"