tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr. 

feedback and ok dtucker
This commit is contained in:
Tim Rice 2013-06-02 14:31:27 -07:00
parent 5ab9b63468
commit 01ec0af301
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16,6 +16,8 @@
need a shell that can handle "[ file1 -nt file2 ]". Rather than keep need a shell that can handle "[ file1 -nt file2 ]". Rather than keep
dealing with shell portability issues in regression tests, we let dealing with shell portability issues in regression tests, we let
configure find us a capable shell on those platforms with an old /bin/sh. configure find us a capable shell on those platforms with an old /bin/sh.
- (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr.
feedback and ok dtucker
20130601 20130601
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to

13
aclocal.m4 vendored
View File

@ -1,4 +1,4 @@
dnl $Id: aclocal.m4,v 1.8 2011/05/20 01:45:25 djm Exp $ dnl $Id: aclocal.m4,v 1.9 2013/06/02 21:31:27 tim Exp $
dnl dnl
dnl OpenSSH-specific autoconf macros dnl OpenSSH-specific autoconf macros
dnl dnl
@ -14,8 +14,15 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
_define_flag="$2" _define_flag="$2"
test "x$_define_flag" = "x" && _define_flag="$1" test "x$_define_flag" = "x" && _define_flag="$1"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])], AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
[ AC_MSG_RESULT([yes]) [
CFLAGS="$saved_CFLAGS $_define_flag"], if `grep -i "unrecognized option" conftest.err >/dev/null`
then
AC_MSG_RESULT([no])
CFLAGS="$saved_CFLAGS"
else
AC_MSG_RESULT([yes])
CFLAGS="$saved_CFLAGS $_define_flag"
fi],
[ AC_MSG_RESULT([no]) [ AC_MSG_RESULT([no])
CFLAGS="$saved_CFLAGS" ] CFLAGS="$saved_CFLAGS" ]
) )