]> git.lizzy.rs Git - rust.git/commitdiff
configure: Don't use pandoc < 1.8. Closes #1513
authorBrian Anderson <banderson@mozilla.com>
Wed, 18 Jan 2012 22:32:15 +0000 (14:32 -0800)
committerBrian Anderson <banderson@mozilla.com>
Wed, 18 Jan 2012 22:32:37 +0000 (14:32 -0800)
configure

index 71ee86389d34018695034808a4cdef6ea8f4e434..44e73ae901b53c2027426868a6eb1a7ac10b23fd 100755 (executable)
--- 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