[Groff] patch for configure.ac and aclocal.m4

[Gaius Mulley]

Hi,

thanks for spotting that I'd altered the wrong files!

I think these two patches perform the same function but in
a more readable form..

Gaius


--- groff-cvs/configure.ac      2003-02-15 07:24:05.000000000 +0000
+++ groff-html/configure.ac     2003-02-22 12:05:25.000000000 +0000
@@ -71,6 +71,7 @@
 GROFF_G
 GROFF_TMAC
 GROFF_HTML_PROGRAMS
+PNMTOPS_NOSETPAGE
 AC_CONFIG_FILES(stamp-h, [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile doc/Makefile src/xditview/Imakefile])
 AC_OUTPUT
--- groff-cvs/aclocal.m4        2002-06-19 14:17:53.000000000 +0100
+++ groff-html/aclocal.m4       2003-02-22 12:07:21.000000000 +0000
@@ -68,13 +68,15 @@
 AC_CHECK_PROG(pnmtopng, pnmtopng, found, missing)
 AC_CHECK_PROG(gs, gs gsos2, found, missing)
 AC_CHECK_PROG(psselect, psselect, found, missing)
-case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect" in
+AC_CHECK_PROG(pstopnm, pstopnm, found, missing)
+AC_CHECK_PROG(pnmtops, pnmtops, found, missing)
+case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect$pnmtops$pstopnm" in
 *missing*)
        make_html=
        make_install_html=
        AC_MSG_WARN([
 
-  Since one or more of the above five programs can't be found in the path,
+  Since one or more of the above seven 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.
 ]) ;;
@@ -82,6 +84,29 @@
 AC_SUBST(make_html)
 AC_SUBST(make_install_html)])dnl
 dnl
+dnl check to see whether pnmtops can handle the -nosetpage option
+dnl
+AC_DEFUN(PNMTOPS_NOSETPAGE,
+[AC_MSG_CHECKING([whether pnmtops can handle the -nosetpage option])
+cat <<EOF | pstopnm > conftest.pnm 2>/dev/null
+%!PS-Adobe-3.0
+/Times-Bold findfont 16 scalefont setfont
+/inch {72 mul} def
+/Times-Roman findfont 10 scalefont setfont
+4.5 inch 0.812500 1 add inch moveto ( testing ) show
+showpage
+EOF
+if pnmtops -nosetpage conftest.pnm >& /dev/null ; then
+    AC_MSG_RESULT(yes)
+    pnm_to_ps_nosetpage="pnmtops -nosetpage"
+else
+    AC_MSG_RESULT(no)
+    pnm_to_ps_nosetpage="pnmtops"
+fi
+rm -f conftest.pnm
+AC_SUBST(pnm_to_ps_nosetpage)
+])dnl
+dnl
 dnl
 dnl GROFF_CSH_HACK(if hack present, if not present)
 dnl