merge 6.3p1

1 files changed, 10 insertions, 3 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 9bdea5ec2..1b3bed790 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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 OpenSSH-specific autoconf macros
 dnl
@@ -14,8 +14,15 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
         _define_flag="$2"
         test "x$_define_flag" = "x" && _define_flag="$1"
         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])
                   CFLAGS="$saved_CFLAGS" ]
         )