diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-01-18 14:32:15 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-01-18 14:32:37 -0800 |
| commit | 17fef6caaf0a1bfb77dde896675997d2bfc9e873 (patch) | |
| tree | dfb092074b7172d2719c7eb461f746f163eec694 | |
| parent | 193279daa2bef57be8b897d3e7426943db577282 (diff) | |
| download | rust-17fef6caaf0a1bfb77dde896675997d2bfc9e873.tar.gz rust-17fef6caaf0a1bfb77dde896675997d2bfc9e873.zip | |
configure: Don't use pandoc < 1.8. Closes #1513
| -rwxr-xr-x | configure | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/configure b/configure index 71ee86389d3..44e73ae901b 100755 --- a/configure +++ b/configure @@ -298,6 +298,16 @@ then probe CFG_NODE nodejs fi +if [ ! -z "$CFG_PANDOC" ] +then + PV=$(pandoc --version | awk '/^pandoc/ {print $2}') + if [ "$PV" \< "1.8" ] + then + step_msg "pandoc $PV is too old. disabling" + BAD_PANDOC=1 + fi +fi + if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] then err "either clang or gcc is required" @@ -616,6 +626,13 @@ then putvar CFG_DISABLE_MANAGE_SUBMODULES fi +# Ditto for pandoc +if [ ! -z $BAD_PANDOC ] +then + CFG_PANDOC= + putvar CFG_PANDOC +fi + if head -n 1 ${CFG_SRC_DIR}src/snapshots.txt | grep -q '^T' then CFG_IN_TRANSITION=1 |