For PR678:

* Make it possible to pass a fourth argument to the CHECK_PROGRAM_SANITY
  macro that controls whether a non-sane program generates an error or
  a warning.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24931 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/m4/sanity_check.m4 b/autoconf/m4/sanity_check.m4
index 5c4d1904fc7d62c4358844209621f457bb50fa49..4c9dce6cb1449b63230a753e5771f8050f857b40 100644 (file)
--- a/autoconf/m4/sanity_check.m4
+++ b/autoconf/m4/sanity_check.m4
@@ -5,6 +5,7 @@ dnl passes the sanity check.
 dnl   $1 - Name or full path of the program to run
 dnl   $2 - Argument to pass to print out identification string
 dnl   $3 - grep RE to match identification string
 dnl   $1 - Name or full path of the program to run
 dnl   $2 - Argument to pass to print out identification string
 dnl   $3 - grep RE to match identification string

+dnl   $4 - set to 1 to make errors only a warning

 AC_DEFUN([CHECK_PROGRAM_SANITY],
 [
 AC_MSG_CHECKING([sanity for program ]$1)
 AC_DEFUN([CHECK_PROGRAM_SANITY],
 [
 AC_MSG_CHECKING([sanity for program ]$1)


@@ -13,9 +14,14 @@ if test "$?" -eq 0 -a -x "$sanity_path" ; then
   sanity=`$1 $2 2>&1 | grep "$3"`
   if test -z "$sanity" ; then
     AC_MSG_RESULT([no])
   sanity=`$1 $2 2>&1 | grep "$3"`
   if test -z "$sanity" ; then
     AC_MSG_RESULT([no])

-    AC_MSG_ERROR([Program ]$1[ failed to pass sanity check.])
+    if test "$4" -eq 1 ; then
+      AC_MSG_WARN([Program ]$1[ failed to pass sanity check.])
+    else
+      AC_MSG_ERROR([Program ]$1[ failed to pass sanity check.])
+    fi
+  else
+    AC_MSG_RESULT([yes])

   fi
   fi

-  AC_MSG_RESULT([yes])

 else
   AC_MSG_RESULT([not found])
 fi
 else
   AC_MSG_RESULT([not found])
 fi