diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | aclocal.m4 | 13 |
2 files changed, 12 insertions, 3 deletions
@@ -16,6 +16,8 @@ | |||
16 | need a shell that can handle "[ file1 -nt file2 ]". Rather than keep | 16 | need a shell that can handle "[ file1 -nt file2 ]". Rather than keep |
17 | dealing with shell portability issues in regression tests, we let | 17 | dealing with shell portability issues in regression tests, we let |
18 | configure find us a capable shell on those platforms with an old /bin/sh. | 18 | configure find us a capable shell on those platforms with an old /bin/sh. |
19 | - (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr. | ||
20 | feedback and ok dtucker | ||
19 | 21 | ||
20 | 20130601 | 22 | 20130601 |
21 | - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to | 23 | - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to |
diff --git a/aclocal.m4 b/aclocal.m4 index 9bdea5ec2..1b3bed790 100644 --- a/aclocal.m4 +++ b/aclocal.m4 | |||
@@ -1,4 +1,4 @@ | |||
1 | dnl $Id: aclocal.m4,v 1.8 2011/05/20 01:45:25 djm Exp $ | 1 | dnl $Id: aclocal.m4,v 1.9 2013/06/02 21:31:27 tim Exp $ |
2 | dnl | 2 | dnl |
3 | dnl OpenSSH-specific autoconf macros | 3 | dnl OpenSSH-specific autoconf macros |
4 | dnl | 4 | dnl |
@@ -14,8 +14,15 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ | |||
14 | _define_flag="$2" | 14 | _define_flag="$2" |
15 | test "x$_define_flag" = "x" && _define_flag="$1" | 15 | test "x$_define_flag" = "x" && _define_flag="$1" |
16 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])], | 16 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])], |
17 | [ AC_MSG_RESULT([yes]) | 17 | [ |
18 | CFLAGS="$saved_CFLAGS $_define_flag"], | 18 | if `grep -i "unrecognized option" conftest.err >/dev/null` |
19 | then | ||
20 | AC_MSG_RESULT([no]) | ||
21 | CFLAGS="$saved_CFLAGS" | ||
22 | else | ||
23 | AC_MSG_RESULT([yes]) | ||
24 | CFLAGS="$saved_CFLAGS $_define_flag" | ||
25 | fi], | ||
19 | [ AC_MSG_RESULT([no]) | 26 | [ AC_MSG_RESULT([no]) |
20 | CFLAGS="$saved_CFLAGS" ] | 27 | CFLAGS="$saved_CFLAGS" ] |
21 | ) | 28 | ) |