summaryrefslogtreecommitdiff
blob: 1df1852ab91fd2a77bcda3ea14c0c820c3519a80 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
From e0c9eba8c080cbbf773f0d540c8291ef486544c9 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 21 May 2020 01:56:54 +0200
Subject: [PATCH] rsvndump_conf.m4: Fix detection of Asciidoc >=8.4.0 for 9.x.x

---
 m4/rsvndump_conf.m4 | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/m4/rsvndump_conf.m4 b/m4/rsvndump_conf.m4
index c8a83ae..838f0f6 100644
--- a/m4/rsvndump_conf.m4
+++ b/m4/rsvndump_conf.m4
@@ -76,15 +76,9 @@ AC_DEFUN([RSVN_CHECK_MAN_PROGS], [
 	ver_maj=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\1/'`
 	ver_min=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\2/'`
 	ver_rev=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\3/'`
-	prog_version_ok="yes"
-	if test $ver_maj -lt 8; then
-		prog_version_ok="no"
-	fi
-	if test $ver_min -lt 4; then
-		prog_version_ok="no"
-	fi
-	if test $ver_rev -lt 0; then
-		prog_version_ok="no"
+	prog_version_ok=no
+	if test $ver_maj -gt 8 -o \( $ver_maj -eq 8 -a $ver_min -ge 4 \); then
+		prog_version_ok=yes
 	fi
 	if test "$prog_version_ok" !=  "yes"; then
 		AC_MSG_ERROR([Asciidoc >= 8.4 is needed. Please upgrade your installation])
-- 
2.26.2