]> git.lizzy.rs Git - rust.git/commitdiff
Merge pull request #3802 from rfw/fix_pandoc_configure
authorTim Chevalier <catamorphism@gmail.com>
Thu, 18 Oct 2012 19:25:11 +0000 (12:25 -0700)
committerTim Chevalier <catamorphism@gmail.com>
Thu, 18 Oct 2012 19:25:11 +0000 (12:25 -0700)
Check pandoc's version correctly for >=1.10.

configure

index 40c6acead0efa3d937f3987c39015d58b3f6d2e4..cd500b6ec43a1cfb39102c247192396b554c39f6 100755 (executable)
--- a/configure
+++ b/configure
@@ -362,10 +362,10 @@ fi
 
 if [ ! -z "$CFG_PANDOC" ]
 then
-    PV=$(pandoc --version | awk '/^pandoc/ {print $2}')
-    if [ "$PV" \< "1.8" ]
+    read PV_MAJOR PV_MINOR <<<$(pandoc --version | awk '/^pandoc/ {split($2, PV, "."); print PV[1] " " PV[2]}')
+    if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
     then
-       step_msg "pandoc $PV is too old. disabling"
+       step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
        BAD_PANDOC=1
     fi
 fi