From 85a16f601e0176ff7ac8ff88e5f9f502d64ca923 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 30 Sep 2014 13:44:25 +0000 Subject: [PATCH] Reduce expected requirements for building comments and pdf docs git-svn-id: http://svn.osgeo.org/postgis/trunk@13012 b70326c6-7e19-0410-871a-916f4a2858ee --- configure.ac | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 671f51e42..520492ffa 100644 --- a/configure.ac +++ b/configure.ac @@ -166,26 +166,20 @@ dnl CAN_BUILD_COMMENTS=yes -AC_PATH_PROG([IMAGEMAGICK], [convert], []) -if test "x$IMAGEMAGICK" = "x"; then - AC_MSG_WARN([ImageMagick does not seem to be installed. Documentation cannot be built]) - CAN_BUILD_COMMENTS=no -fi - AC_PATH_PROG([XSLTPROC], [xsltproc], []) if test "x$XSLTPROC" = "x"; then AC_MSG_WARN([xsltproc is not installed so documentation cannot be built]) CAN_BUILD_COMMENTS=no fi -AC_PATH_PROG([XMLLINT], [xmllint], []) -if test "x$XMLLINT" = "x"; then - AC_MSG_WARN([xmllint is not installed so documentation cannot be checked]) - CAN_BUILD_COMMENTS=no -fi - CAN_BUILD_PDF=${CAN_BUILD_COMMENTS} +AC_PATH_PROG([IMAGEMAGICK], [convert], []) +if test "x$IMAGEMAGICK" = "x"; then + AC_MSG_WARN([ImageMagick does not seem to be installed. Documentation cannot be built]) + CAN_BUILD_PDF=no +fi + AC_PATH_PROG([DBLATEX], [dblatex], []) if test "x$DBLATEX" = "x"; then AC_MSG_WARN([dblatex is not installed so PDF documentation cannot be built]) @@ -195,6 +189,12 @@ fi AC_SUBST(CAN_BUILD_COMMENTS) AC_SUBST(CAN_BUILD_PDF) +AC_PATH_PROG([XMLLINT], [xmllint], []) +if test "x$XMLLINT" = "x"; then + AC_MSG_WARN([xmllint is not installed so documentation cannot be checked]) +fi + + dnl dnl Allow the user to specify the location of the html/docbook.xsl stylesheet dnl -- 2.40.0