commit 9e0c3b8f49020d6eb31624bd653e50214cbe2cc4 (HEAD, refs/heads/withdoc) Author: Steffen (Daode) Nurpmeso Date: 2014-03-15 20:57:50 +0100 configure: regenerate --- configure | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 138 insertions(+), 27 deletions(-) diff --git a/configure b/configure index 274ff49..fc65e8b 100755 --- a/configure +++ b/configure @@ -627,12 +627,20 @@ ac_func_list= ac_subst_vars='LTLIBOBJS GLIBC21 pnmtops_nosetpage +make_uninstall_pdfexamples +make_install_pdfexamples +make_pdfexamples +make_uninstall_pdfdoc make_install_pdfdoc make_pdfdoc ac_ct_AWK ALT_AWK_PROGS -make_install_html -make_html +make_uninstall_htmlexamples +make_install_htmlexamples +make_htmlexamples +make_uninstall_htmldoc +make_install_htmldoc +make_htmldoc pnmtops psselect pnmtopng @@ -669,7 +677,17 @@ INSTALL_SCRIPT INSTALL_PROGRAM INSTALL_INFO RANLIB +make_uninstall_infodoc +make_install_infodoc +make_infodoc MAKEINFO +make_uninstall_examples +make_install_examples +make_examples +make_uninstall_otherdoc +make_install_otherdoc +make_otherdoc +doc_dist_target_ok YACC DVIPRINT PSPRINT @@ -752,6 +770,7 @@ enable_option_checking with_x with_appresdir with_grofferdir +with_doc with_gnu_ld enable_rpath with_libiconv_prefix @@ -1399,6 +1418,10 @@ Optional Packages: --with-x use the X Window System --with-appresdir=DIR X11 application resource files --with-grofferdir=DIR groffer files location + --with-doc[=TYPE] choose which manuals (beside man pages) are + desirable. Give TYPE as a comma-separated list of + one or multiple of `info', `pdf' and `html', as well + as `examples', to restrict what is produced --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir @@ -6034,7 +6057,63 @@ fi done test -n "$YACC" || YACC="yacc" -missing= + +# Check whether --with-doc was given. +if test "${with_doc+set}" = set; then : + withval=$with_doc; doc=${withval} +else + doc=yes +fi + + test "${doc}" = "no" && doc='' + if test "${doc}" = yes; then + doc_dist_target_ok=yes + docadd_other=yes + docadd_info=yes docadd_pdf=yes docadd_html=yes docadd_examples=yes + else + # Don't use case/esac, verify input + doc_dist_target_ok=no + docadd_other= + docadd_info= docadd_pdf= docadd_html= docadd_examples= + test -n "${doc}" && docadd_other=yes + OFS=${IFS} + IFS=',' + set -- ${doc} + IFS=${OFS} + for i + do + test "${i}" = info && { docadd_info=yes; continue; } + test "${i}" = pdf && { docadd_pdf=yes; continue; } + test "${i}" = html && { docadd_html=yes; continue; } + test "${i}" = examples && { docadd_examples=yes; continue; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid --with-doc argument: ${i}" >&5 +$as_echo "$as_me: WARNING: Invalid --with-doc argument: ${i}" >&2;} + done + fi + if test "${docadd_other}" = yes; then + make_otherdoc=otherdoc + make_install_otherdoc=install_otherdoc + make_uninstall_otherdoc=uninstall_otherdoc + else + make_otherdoc= make_install_otherdoc= make_uninstall_otherdoc= + fi + if test "${docadd_examples}" = yes; then + make_examples=examples + make_install_examples=install_examples + make_uninstall_examples=uninstall_examples + else + make_examples= make_install_examples= make_uninstall_examples= + fi + + + + + + + +make_infodoc= make_install_infodoc= make_uninstall_infodoc= MAKEINFO= + if test "${docadd_info}" = yes; then + missing= # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -6108,6 +6187,13 @@ Get the \`texinfo' package version 4.8 or newer if you want to convert \`groff.texinfo' into a PDF or HTML document." >&2;} fi fi + make_infodoc=infodoc + make_install_infodoc=install_infodoc + make_uninstall_infodoc=uninstall_infodoc + fi + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. @@ -6233,7 +6319,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_dir=`cd $ac_aux_dir; pwd` ac_install_sh="$ac_dir/install-sh -c" -for ac_prog in install-info +if test "$docadd_info" = yes; then + for ac_prog in install-info do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6276,6 +6363,7 @@ fi done test -n "$INSTALL_INFO" || INSTALL_INFO=":" + fi # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -10235,9 +10323,9 @@ fi fi test "$GHOSTSCRIPT" = "no" && GHOSTSCRIPT=missing +make_htmldoc= make_install_htmldoc= make_uninstall_htmldoc= + make_htmlexamples= make_install_htmlexamples= make_uninstall_htmlexamples= - make_html=html - make_install_html=install_html missing= # Extract the first word of "pnmcut", so it can be a program name with args. @@ -10444,7 +10532,18 @@ fi test "$GHOSTSCRIPT" = "missing" && missing="$missing \`gs'" - if test -n "$missing"; then + if test -z "${missing}"; then + if test "${docadd_html}" = yes; then + make_htmldoc=htmldoc + make_install_htmldoc=install_htmldoc + make_uninstall_htmldoc=uninstall_htmldoc + if test "${docadd_examples}" = yes; then + make_htmlexamples=html_examples + make_install_htmlexamples=install_htmlexamples + make_uninstall_htmlexamples=uninstall_htmlexamples + fi + fi + else plural=`set $missing; test $# -gt 1 && echo s` missing=`set $missing missing="" @@ -10459,32 +10558,33 @@ fi done echo $missing` - make_html= - make_install_html= + docnote=. + test "${docadd_html}" = yes && docnote='; + therefore, it will neither be possible to prepare, nor to install, + documentation in HTML format.' { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural: The program$plural $missing cannot be found in the PATH. - Consequently, groff's HTML backend (grohtml) will not work properly; - therefore, it will neither be possible to prepare, nor to install, - documentation in HTML format. + Consequently, groff's HTML backend (grohtml) will not work properly${docnote} " >&5 $as_echo "$as_me: WARNING: missing program$plural: The program$plural $missing cannot be found in the PATH. - Consequently, groff's HTML backend (grohtml) will not work properly; - therefore, it will neither be possible to prepare, nor to install, - documentation in HTML format. + Consequently, groff's HTML backend (grohtml) will not work properly${docnote} " >&2;} fi + + + # Check whether --with-alt-awk was given. if test "${with_alt_awk+set}" = set; then : withval=$with_alt_awk; ALT_AWK_PROGS="$withval" @@ -10602,42 +10702,53 @@ fi fi test "$AWK" = "no" && AWK=missing +make_pdfdoc= make_install_pdfdoc= make_uninstall_pdfdoc= + make_pdfexamples= make_install_pdfexamples= make_uninstall_pdfexamples= - make_pdfdoc=pdfdoc - make_install_pdfdoc=install_pdfdoc - missing="" test "$AWK" = missing && missing="\`awk'" test "$GHOSTSCRIPT" = missing && missing="$missing \`gs'" - if test -n "$missing"; then + if test -z "${missing}"; then + if test "${docadd_pdf}" = yes; then + make_pdfdoc=pdfdoc + make_install_pdfdoc=install_pdfdoc + make_uninstall_pdfdoc=uninstall_pdfdoc + if test "${docadd_examples}" = yes; then + make_pdfexamples=pdfexamples + make_install_pdfexamples=install_pdfexamples + make_uninstall_pdfexamples=uninstall_pdfexamples + fi + fi + else plural=`set $missing; test $# -eq 2 && echo s` test x$plural = xs \ && missing=`set $missing; echo "$1 and $2"` \ || missing=`echo $missing` - make_pdfdoc= - make_install_pdfdoc= + docnote=. + test "${docadd_pdf}" = yes && docnote='; + therefore, it will neither be possible to prepare, nor to install, + documentation and most of the examples in PDF format.' { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural: The program$plural $missing cannot be found in the PATH. - Consequently, groff's PDF formatter (pdfroff) will not work properly; - therefore, it will neither be possible to prepare, nor to install, - documentation in PDF format. + Consequently, groff's PDF formatter (pdfroff) will not work properly${docnote} " >&5 $as_echo "$as_me: WARNING: missing program$plural: The program$plural $missing cannot be found in the PATH. - Consequently, groff's PDF formatter (pdfroff) will not work properly; - therefore, it will neither be possible to prepare, nor to install, - documentation in PDF format. + Consequently, groff's PDF formatter (pdfroff) will not work properly${docnote} " >&2;} fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pnmtops can handle the -nosetpage option" >&5 $as_echo_n "checking whether pnmtops can handle the -nosetpage option... " >&6; } if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then