[3.0] 55e70a4 Make it possible to disable checks for rst2man and rst2html

Tollef Fog Heen tfheen at varnish-cache.org
Wed Oct 26 14:58:58 CEST 2011


commit 55e70a4a651d061f50b030888b3c677b4bdb97df
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date:   Mon Oct 24 09:24:36 2011 +0200

    Make it possible to disable checks for rst2man and rst2html

diff --git a/configure.ac b/configure.ac
index 46df5ad..1f58e00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,16 +50,24 @@ if test "x$XSLTPROC" = "xno"; then
    AC_MSG_WARN([xsltproc not found – not building documentation])
 fi
 AM_CONDITIONAL(HAVE_XSLTPROC,[test "x$XSLTPROC" != "xno"])
-AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
-if test "x$RST2MAN" = "xno"; then
-   AC_MSG_WARN([rst2man not found – not building man pages])
-fi
+AC_ARG_WITH([rst2man],
+               AS_HELP_STRING([--with-rst2man=PATH],
+                              [Location of rst2man (auto)]),
+               [RST2MAN="$withval"],
+               [AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
+	        if test "x$RST2MAN" = "xno"; then
+		   AC_MSG_WARN([rst2man not found – not building man pages])
+		fi])
 AM_CONDITIONAL(HAVE_RST2MAN,[test "x$RST2MAN" != "xno"])
 
-AC_CHECK_PROGS(RST2HTML, [rst2html rst2html.py], "no")
-if test "x$RST2HTML" = "xno"; then
-   AC_MSG_WARN([rst2html not found – not building changelog])
-fi
+AC_ARG_WITH([rst2html],
+               AS_HELP_STRING([--with-rst2html=PATH],
+                              [Location of rst2html (auto)]),
+               [RST2HTML="$withval"],
+               [AC_CHECK_PROGS(RST2HTML, [rst2html rst2html.py], "no")
+	        if test "x$RST2HTML" = "xno"; then
+		   AC_MSG_WARN([rst2html not found – not building changelog])
+		fi])
 AM_CONDITIONAL(HAVE_RST2HTML,[test "x$RST2HTML" != "xno"])
 
 # Checks for libraries.



More information about the varnish-commit mailing list