summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Criswell <criswell@uiuc.edu>2003-09-23 20:46:32 +0000
committerJohn Criswell <criswell@uiuc.edu>2003-09-23 20:46:32 +0000
commit8d5d13d69ccdff1bae417c388c46ec689b2597dc (patch)
treefda5f6413d4e55b59125f783a50e48463a64de57
parentd7e18989cdf1c34ae7d92f546210277c8f78de87 (diff)
downloadbcm5719-llvm-8d5d13d69ccdff1bae417c388c46ec689b2597dc.tar.gz
bcm5719-llvm-8d5d13d69ccdff1bae417c388c46ec689b2597dc.zip
If we fail to find python or qmtest, give a warning message instead of an
error message. This should hopefully allow our nightly tester to run, which does not run the QMTest tests at present. llvm-svn: 8691
-rw-r--r--llvm/autoconf/configure.ac4
-rwxr-xr-xllvm/configure10
2 files changed, 6 insertions, 8 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index 1c965c28911..07986edfe08 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -356,13 +356,13 @@ AC_PATH_PROG(PURIFY,[purify],[false])
AC_PATH_PROG(PYTHON,[python],[false])
if test ${PYTHON} = "false"
then
- AC_MSG_ERROR([python required but not found])
+ AC_MSG_WARN([python required but not found])
fi
AC_PATH_PROG(QMTEST,[qmtest],[false])
if test ${QMTEST} = "false"
then
- AC_MSG_ERROR([qmtest required but not found])
+ AC_MSG_WARN([qmtest required but not found])
fi
dnl Verify that the version of python available is high enough for qmtest
diff --git a/llvm/configure b/llvm/configure
index 41ef65633c3..1c5f2cbfee8 100755
--- a/llvm/configure
+++ b/llvm/configure
@@ -18983,9 +18983,8 @@ fi
if test ${PYTHON} = "false"
then
- { { echo "$as_me:$LINENO: error: python required but not found" >&5
-echo "$as_me: error: python required but not found" >&2;}
- { (exit 1); exit 1; }; }
+ { echo "$as_me:$LINENO: WARNING: python required but not found" >&5
+echo "$as_me: WARNING: python required but not found" >&2;}
fi
# Extract the first word of "qmtest", so it can be a program name with args.
@@ -19030,9 +19029,8 @@ fi
if test ${QMTEST} = "false"
then
- { { echo "$as_me:$LINENO: error: qmtest required but not found" >&5
-echo "$as_me: error: qmtest required but not found" >&2;}
- { (exit 1); exit 1; }; }
+ { echo "$as_me:$LINENO: WARNING: qmtest required but not found" >&5
+echo "$as_me: WARNING: qmtest required but not found" >&2;}
fi
pyversion=`$PYTHON -V 2>&1 | cut -d\ -f2`
OpenPOWER on IntegriCloud