diff options
| author | Robin Kruppe <robin.kruppe@gmail.com> | 2015-10-01 14:34:31 +0200 |
|---|---|---|
| committer | Robin Kruppe <robin.kruppe@gmail.com> | 2015-10-01 14:34:31 +0200 |
| commit | 4df35ba4548ff682e38672fcf54754435a697fa3 (patch) | |
| tree | f029f2f1cbf86b2be3db4d3088d179ce78ca9c0e | |
| parent | 78edd4f3a0c614c8deab030351ece9baade848cc (diff) | |
| download | rust-4df35ba4548ff682e38672fcf54754435a697fa3.tar.gz rust-4df35ba4548ff682e38672fcf54754435a697fa3.zip | |
Stop probing for pandoc and xelatex, they are not used any more.
| -rwxr-xr-x | configure | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/configure b/configure index fa2117dcc1d..21657b0bdaa 100755 --- a/configure +++ b/configure @@ -766,8 +766,6 @@ probe CFG_ANTLR4 antlr4 probe CFG_GRUN grun probe CFG_FLEX flex probe CFG_BISON bison -probe CFG_PANDOC pandoc -probe CFG_XELATEX xelatex probe CFG_GDB gdb probe CFG_LLDB lldb @@ -826,26 +824,6 @@ step_msg "looking for target specific programs" probe CFG_ADB adb -if [ -n "$CFG_PANDOC" ] -then - # Extract "MAJOR MINOR" from Pandoc's version number - PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' | - sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/') - - MIN_PV_MAJOR="1" - MIN_PV_MINOR="9" - - # these patterns are shell globs, *not* regexps - PV_MAJOR=${PV_MAJOR_MINOR% *} - PV_MINOR=${PV_MAJOR_MINOR#* } - - if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ] - then - step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling" - BAD_PANDOC=1 - fi -fi - BIN_SUF= if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ] then @@ -1775,12 +1753,6 @@ then fi -if [ -n $BAD_PANDOC ] -then - CFG_PANDOC= - putvar CFG_PANDOC -fi - putvar CFG_LLVM_SRC_DIR for t in $CFG_HOST |
