2010-12-03 [paul] 3.7.7cvs11

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6f76c34784f95ff7164b581e328476f881e6efdd..79e33568bda988f87ebf7ccd303d7c715d4952ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -212,42 +212,20 @@ dnl ******************************
 dnl ** Check for required tools **
 dnl ** to build manuals         **
 dnl ******************************
-SAXON=`which saxon 2> /dev/null`
-if test $? -ne 0; then
-       SAXON=
-fi
-if test -z "$SAXON"; then
-        SAXONJAR='/usr/share/java/saxon.jar'
-        if test ! -f "$SAXONJAR"; then
-                SAXONJAR='/usr/local/share/java/saxon.jar'
-                if test ! -f "$SAXONJAR"; then
-                        SAXONJAR=
-                fi
-        fi
-fi
-AM_CONDITIONAL(MANUAL_PDF, test -n "$SAXON" -o -n "$SAXONJAR")
 
-DOCBOOK2TXT=`which docbook2txt 2> /dev/null`
-if test $? -ne 0; then
-       DOCBOOK2TXT=
-fi
-AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+AC_PATH_PROG(DOCBOOK2HTML, docbook2html)
+AC_PATH_PROG(DOCBOOK2TXT, docbook2txt)
+AC_PATH_PROG(DOCBOOK2PS, docbook2ps)
+AC_PATH_PROG(DOCBOOK2PDF, docbook2pdf)
 
-DOCBOOK2HTML=`which docbook2html 2> /dev/null`
-if test $? -ne 0; then
-        DOCBOOK2HTML=
-fi
 AM_CONDITIONAL(MANUAL_HTML, test -n "$DOCBOOK2HTML")
-
-DOCBOOK2PS=`which docbook2ps 2> /dev/null`
-if test $? -ne 0; then
-        DOCBOOK2PS=
-fi
+AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+AM_CONDITIONAL(MANUAL_PDF, test -n "$DOCBOOK2PDF")
 AM_CONDITIONAL(MANUAL_PS, test -n "$DOCBOOK2PS")
 
 if test x"$ac_cv_enable_manual" = x"yes"; then
     if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" \
-       -o -n "$DOCBOOK2PS" -o -n "$SAXON" -o -n "$SAXONJAR"; then
+       -o -n "$DOCBOOK2PS" -o -n "$DOCBOOK2PDF"; then
            ac_cv_enable_manual=yes
        else
            ac_cv_enable_manual=no