about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTony Young <tony@rfw.name>2012-10-18 22:56:22 +1300
committerTony Young <tony@rfw.name>2012-10-19 00:30:17 +1300
commit2c1ed186fc2a4ccfa49d8395fe1aae85b10e402b (patch)
tree9a1cd8cfde65c065f02537347fb5178dd29354d0
parente28a161b720e267c837905e5f1b0760f71ebee14 (diff)
downloadrust-2c1ed186fc2a4ccfa49d8395fe1aae85b10e402b.tar.gz
rust-2c1ed186fc2a4ccfa49d8395fe1aae85b10e402b.zip
Check pandoc's version correctly for >=1.10.
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 40c6acead0e..cd500b6ec43 100755
--- 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