From f9b458c88b83b60004b97b112bc46365406726bd Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 27 Apr 2006 07:49:24 +0000 Subject: For PR747: If we fail to find a required program, simply set that program to echo out something that tells the user the situation. That is, instead of just "true runtest" we now get "echo 'Skipped: runtest not found'". git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27990 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/configure.ac | 20 ++++++++++---------- configure | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index f152bc8b94..a75300035c 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -381,17 +381,17 @@ dnl Checks for documentation and testing tools that we can do without. If these dnl are not found then they are set to "true" which always succeeds but does dnl nothing. This just lets the build output show that we could have done dnl something if the tool was available. -AC_PATH_PROG(BZIP2,[bzip2],[true bzip2]) -AC_PATH_PROG(DOT,[dot],[true dot]) -AC_PATH_PROG(DOXYGEN,[doxygen],[true doxygen]) -AC_PATH_PROG(ETAGS,[etags],[true etags]) -AC_PATH_PROG(GROFF,[groff],[true groff]) -AC_PATH_PROG(GZIP,[gzip],[true gzip]) -AC_PATH_PROG(POD2HTML,[pod2html],[true pod2html]) -AC_PATH_PROG(POD2MAN,[pod2man],[true pod2man]) -AC_PATH_PROG(RUNTEST,[runtest],[true runtest]) +AC_PATH_PROG(BZIP2,[bzip2],[echo "Skipped: bzip2 not found"]) +AC_PATH_PROG(DOT,[dot],[echo "Skipped: dot not found"]) +AC_PATH_PROG(DOXYGEN,[doxygen],[echo "Skipped: doxygen not found"]) +AC_PATH_PROG(ETAGS,[etags],[echo "Skipped: etags not found"]) +AC_PATH_PROG(GROFF,[groff],[echo "Skipped: groff not found"]) +AC_PATH_PROG(GZIP,[gzip],[echo "Skipped: gzip not found"]) +AC_PATH_PROG(POD2HTML,[pod2html],[echo "Skipped: pod2html not found"]) +AC_PATH_PROG(POD2MAN,[pod2man],[echo "Skipped: pod2man not found"]) +AC_PATH_PROG(RUNTEST,[runtest],[echo "Skipped: runtest not found"]) DJ_AC_PATH_TCLSH -AC_PATH_PROG(ZIP,[zip],[true zip]) +AC_PATH_PROG(ZIP,[zip],[echo "Skipped: zip not found"]) dnl Determine if the linker supports the -R option. AC_LINK_USE_R diff --git a/configure b/configure index 449a7933b6..e196a0f953 100755 --- a/configure +++ b/configure @@ -5400,7 +5400,7 @@ do done done - test -z "$ac_cv_path_BZIP2" && ac_cv_path_BZIP2="true bzip2" + test -z "$ac_cv_path_BZIP2" && ac_cv_path_BZIP2="echo "Skipped: bzip2 not found"" ;; esac fi @@ -5440,7 +5440,7 @@ do done done - test -z "$ac_cv_path_DOT" && ac_cv_path_DOT="true dot" + test -z "$ac_cv_path_DOT" && ac_cv_path_DOT="echo "Skipped: dot not found"" ;; esac fi @@ -5480,7 +5480,7 @@ do done done - test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="true doxygen" + test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="echo "Skipped: doxygen not found"" ;; esac fi @@ -5520,7 +5520,7 @@ do done done - test -z "$ac_cv_path_ETAGS" && ac_cv_path_ETAGS="true etags" + test -z "$ac_cv_path_ETAGS" && ac_cv_path_ETAGS="echo "Skipped: etags not found"" ;; esac fi @@ -5560,7 +5560,7 @@ do done done - test -z "$ac_cv_path_GROFF" && ac_cv_path_GROFF="true groff" + test -z "$ac_cv_path_GROFF" && ac_cv_path_GROFF="echo "Skipped: groff not found"" ;; esac fi @@ -5600,7 +5600,7 @@ do done done - test -z "$ac_cv_path_GZIP" && ac_cv_path_GZIP="true gzip" + test -z "$ac_cv_path_GZIP" && ac_cv_path_GZIP="echo "Skipped: gzip not found"" ;; esac fi @@ -5640,7 +5640,7 @@ do done done - test -z "$ac_cv_path_POD2HTML" && ac_cv_path_POD2HTML="true pod2html" + test -z "$ac_cv_path_POD2HTML" && ac_cv_path_POD2HTML="echo "Skipped: pod2html not found"" ;; esac fi @@ -5680,7 +5680,7 @@ do done done - test -z "$ac_cv_path_POD2MAN" && ac_cv_path_POD2MAN="true pod2man" + test -z "$ac_cv_path_POD2MAN" && ac_cv_path_POD2MAN="echo "Skipped: pod2man not found"" ;; esac fi @@ -5720,7 +5720,7 @@ do done done - test -z "$ac_cv_path_RUNTEST" && ac_cv_path_RUNTEST="true runtest" + test -z "$ac_cv_path_RUNTEST" && ac_cv_path_RUNTEST="echo "Skipped: runtest not found"" ;; esac fi @@ -5849,7 +5849,7 @@ do done done - test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="true zip" + test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="echo "Skipped: zip not found"" ;; esac fi -- cgit v1.2.3