diff options
author | Werner LEMBERG <wl@gnu.org> | 2003-04-17 16:42:16 +0000 |
---|---|---|
committer | Werner LEMBERG <wl@gnu.org> | 2003-04-17 16:42:16 +0000 |
commit | c96286c847f1151dbae74c7ed6a615194ca3c5c4 (patch) | |
tree | 535b23bf9aabeb7e1c3e9bd2f83128de6a37af00 | |
parent | 3e3bc185df7922ddfc1d30f619f45f59aabf3a94 (diff) | |
download | groff-git-c96286c847f1151dbae74c7ed6a615194ca3c5c4.tar.gz |
* aclocal.m4 (GROFF_HTML_PROGRAMS): Emit useful warning message
if --quiet is used for the configure script.
* configure: Regenerated.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | aclocal.m4 | 64 | ||||
-rwxr-xr-x | configure | 72 |
3 files changed, 115 insertions, 25 deletions
@@ -4,6 +4,10 @@ * tmac/hyphenex.pl: This perl script to avoid sed compatibility nightmares. + * aclocal.m4 (GROFF_HTML_PROGRAMS): Emit useful warning message + if --quiet is used for the configure script. + * configure: Regenerated. + 2003-04-16 Werner LEMBERG <wl@gnu.org> * src/devices/grohtml/post-html.cpp (text_glob::text_glob): diff --git a/aclocal.m4 b/aclocal.m4 index ef8cd404f..4b1b68ecd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -63,23 +63,65 @@ dnl AC_DEFUN(GROFF_HTML_PROGRAMS, [make_html=html make_install_html=install_html +missing= AC_CHECK_PROG(pnmcut, pnmcut, found, missing) +if test $pnmcut = missing; then + missing="$missing pnmcut" +fi AC_CHECK_PROG(pnmcrop, pnmcrop, found, missing) +if test $pnmcrop = missing; then + missing="$missing pnmcrop" +fi AC_CHECK_PROG(pnmtopng, pnmtopng, found, missing) +if test $pnmtopng = missing; then + missing="$missing pnmtopng" +fi AC_CHECK_PROG(gs, gs gsos2, found, missing) +if test $gs = missing; then + missing="$missing gs" +fi AC_CHECK_PROG(psselect, psselect, found, missing) +if test $psselect = missing; then + missing="$missing psselect" +fi AC_CHECK_PROG(pnmtops, pnmtops, found, missing) -case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect$pnmtops$pstopnm" in -*missing*) +if test $pnmtops = missing; then + missing="$missing pnmtops" +fi +if test -n "$missing"; then + cnt=0 + for i in $missing + do + cnt=`expr $cnt + 1` + eval "prog$cnt=$i" + done + plural="s" + case $cnt in + 1) + plural="" + progs="\`$prog1'" ;; + 2) + progs="\`$prog1' and \`$prog2'" ;; + 3) + progs="\`$prog1', \`$prog2', and \`$prog3'" ;; + 4) + progs="\`$prog1', \`$prog2', \`$prog3', and \`$prog4'" ;; + 5) + progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', and \`$prog5'" ;; + 6) + progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', \`$prog5', and \`$prog6'" ;; + esac make_html= make_install_html= AC_MSG_WARN([ - Since one or more of the above six programs can't be found in the path, - the HTML backend of groff (grohtml) won't work properly. Consequently, - no documentation in HTML format is built and installed. -]) ;; -esac + The program$plural + $progs + can't be found in the path, thus the HTML backend of groff (grohtml) + won't work properly. Consequently, no documentation in HTML format + is built and installed. +]) +fi AC_SUBST(make_html) AC_SUBST(make_install_html)])dnl dnl @@ -88,11 +130,11 @@ dnl AC_DEFUN(GROFF_PNMTOPS_NOSETPAGE, [AC_MSG_CHECKING([whether pnmtops can handle the -nosetpage option]) if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then - AC_MSG_RESULT(yes) - pnmtops_nosetpage="pnmtops -nosetpage" + AC_MSG_RESULT(yes) + pnmtops_nosetpage="pnmtops -nosetpage" else - AC_MSG_RESULT(no) - pnmtops_nosetpage="pnmtops" + AC_MSG_RESULT(no) + pnmtops_nosetpage="pnmtops" fi AC_SUBST(pnmtops_nosetpage) ])dnl @@ -5872,6 +5872,7 @@ echo "${ECHO_T}$tmac_wrap" >&6 make_html=html make_install_html=install_html +missing= # Extract the first word of "pnmcut", so it can be a program name with args. set dummy pnmcut; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -5908,6 +5909,9 @@ else echo "${ECHO_T}no" >&6 fi +if test $pnmcut = missing; then + missing="$missing pnmcut" +fi # Extract the first word of "pnmcrop", so it can be a program name with args. set dummy pnmcrop; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -5944,6 +5948,9 @@ else echo "${ECHO_T}no" >&6 fi +if test $pnmcrop = missing; then + missing="$missing pnmcrop" +fi # Extract the first word of "pnmtopng", so it can be a program name with args. set dummy pnmtopng; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -5980,6 +5987,9 @@ else echo "${ECHO_T}no" >&6 fi +if test $pnmtopng = missing; then + missing="$missing pnmtopng" +fi # Extract the first word of "gs gsos2", so it can be a program name with args. set dummy gs gsos2; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -6016,6 +6026,9 @@ else echo "${ECHO_T}no" >&6 fi +if test $gs = missing; then + missing="$missing gs" +fi # Extract the first word of "psselect", so it can be a program name with args. set dummy psselect; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -6052,6 +6065,9 @@ else echo "${ECHO_T}no" >&6 fi +if test $psselect = missing; then + missing="$missing psselect" +fi # Extract the first word of "pnmtops", so it can be a program name with args. set dummy pnmtops; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -6088,35 +6104,63 @@ else echo "${ECHO_T}no" >&6 fi -case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect$pnmtops$pstopnm" in -*missing*) +if test $pnmtops = missing; then + missing="$missing pnmtops" +fi +if test -n "$missing"; then + cnt=0 + for i in $missing + do + cnt=`expr $cnt + 1` + eval "prog$cnt=$i" + done + plural="s" + case $cnt in + 1) + plural="" + progs="\`$prog1'" ;; + 2) + progs="\`$prog1' and \`$prog2'" ;; + 3) + progs="\`$prog1', \`$prog2', and \`$prog3'" ;; + 4) + progs="\`$prog1', \`$prog2', \`$prog3', and \`$prog4'" ;; + 5) + progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', and \`$prog5'" ;; + 6) + progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', \`$prog5', and \`$prog6'" ;; + esac make_html= make_install_html= { echo "$as_me:$LINENO: WARNING: - Since one or more of the above six programs can't be found in the path, - the HTML backend of groff (grohtml) won't work properly. Consequently, - no documentation in HTML format is built and installed. + The program$plural + $progs + can't be found in the path, thus the HTML backend of groff (grohtml) + won't work properly. Consequently, no documentation in HTML format + is built and installed. " >&5 echo "$as_me: WARNING: - Since one or more of the above six programs can't be found in the path, - the HTML backend of groff (grohtml) won't work properly. Consequently, - no documentation in HTML format is built and installed. -" >&2;} ;; -esac + The program$plural + $progs + can't be found in the path, thus the HTML backend of groff (grohtml) + won't work properly. Consequently, no documentation in HTML format + is built and installed. +" >&2;} +fi echo "$as_me:$LINENO: checking whether pnmtops can handle the -nosetpage option" >&5 echo $ECHO_N "checking whether pnmtops can handle the -nosetpage option... $ECHO_C" >&6 if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - pnmtops_nosetpage="pnmtops -nosetpage" + pnmtops_nosetpage="pnmtops -nosetpage" else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - pnmtops_nosetpage="pnmtops" + pnmtops_nosetpage="pnmtops" fi |