configure.ac: Improve order, require rst2man

Makefile.am

@@ -17,11 +17,4 @@ coverage:
 	$(MAKE) $(AM_MAKEFLAGS) -C src coverage
 
 %.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9:
-if HAVE_RST2MAN
 	${RST2MAN} $< $@
-else
-	@echo "========================================"
-	@echo "You need rst2man installed to make dist"
-	@echo "========================================"
-	@false
-endif

configure.ac

@@ -9,8 +9,21 @@ AC_LANG(C)
 
 AM_INIT_AUTOMAKE([1.12 -Wall -Werror foreign parallel-tests])
 AM_SILENT_RULES([yes])
-AM_PROG_AR
 
+AC_ARG_WITH([rst2man],
+	AS_HELP_STRING(
+		[--with-rst2man=PATH],
+		[Location of rst2man (auto)]),
+	[RST2MAN="$withval"],
+	[AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])])
+
+m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
+
+VARNISH_PREREQ([trunk])
+VARNISH_VMODS([pesi pesi_debug])
+VARNISH_COUNTERS([pesi])
+
+AM_PROG_AR
 LT_PREREQ([2.2.6])
 LT_INIT([dlopen disable-static])
 
@@ -20,14 +33,6 @@ LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 CC="$PTHREAD_CC"
 
-AC_ARG_WITH([rst2man],
-	AS_HELP_STRING(
-		[--with-rst2man=PATH],
-		[Location of rst2man (auto)]),
-	[RST2MAN="$withval"],
-	[AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])])
-AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
-
 AC_ARG_WITH([lcov],
 	AS_HELP_STRING(
 		[--with-lcov=PATH],
@@ -46,10 +51,6 @@ AM_CONDITIONAL(HAVE_GENHTML, [test -n "$GENHTML"])
 
 m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
 
-VARNISH_PREREQ([trunk])
-VARNISH_VMODS([pesi pesi_debug])
-VARNISH_COUNTERS([pesi])
-
 VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
 AC_SUBST(VMOD_TESTS)