Skip to content

configure: Stop probing for pandoc and xelatex #28789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2015
Merged

configure: Stop probing for pandoc and xelatex #28789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down