* src/roff/troff/input.cpp (string_iterator::fill): Protect against

null pointer.

* tmac/papersize.tmac: Convert `paper' string contents to lowercase.

* configure: Regenerated.

* NEWS: Updated.


Integrate `pdfmark' into normal groff build system;
install macro `pdfmark' packages, build and install `pdfroff',
and PDF format documentation.

* Makefile.comm: Add PDFDOCDIR.

* Makefile.in: (MDEFINES) ALT_AWK_PROGS, ALT_GHOSTSCRIPT_PROGS,
pdfdocdir, make_pdfdoc, make_install_pdfdoc: New variables.
(unstall_dirs): Add pdfdocdir.

* aclocal.m4: (GROFF_APPRESDIR_OPTION): use AC_HELP_STRING instead
of AS_HELP_STRING.
(GROFF_GHOSTSCRIPT_PREFS): New function; support `--with-alt-gs'
option, set ALT_GHOSTSCRIPT_PROGS.
(GROFF_GHOSTSCRIPT_PATH): Support `--with-gs' option, force use of
GROFF_GHOSTSCRIPT_PREFS, set GHOSTSCRIPT.
(GROFF_HTML_PROGRAMS): Force use of GROFF_GHOSTSCRIPT_PATH; tidy up.
(GROFF_AWK_PREFS): New function; support `--with-alt-awk' option,
set ALT_AWK_PROGS.
(GROFF_AWK_PATH): New function; support `--with-awk' option, force
use of GROFF_AWK_PREFS.
(GROFF_PDFDOC_PROGRAMS): New function; force use of GROFF_AWK_PATH
and GROFF_GHOSTSCRIPT_PATH, set make_pdfdoc and make_install_pdfdoc.

* configure.ac: Add AC_PREREQ(2.56), GROFF_PDFDOC_PROGRAMS.
Remove GROFF_GHOSTSCRIPT_PATH, (forced by GROFF_PDFDOC_PROGRAMS, and
also by modified GROFF_HTML_PROGRAMS).

1 files changed, 23 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index 57428cda..c03b70b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,9 +44,17 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
 PAGE=@PAGE@
 
 # The name of the ghostscript program. Normally, gs, on GNU/Linux
-# but it might be different on cygwin systems.
+# but it might be different on MS-DOS/MS-WIN32 systems.
 GHOSTSCRIPT=@GHOSTSCRIPT@
 
+# `ALT_GHOSTSCRIPT_PROGS' specifies a list alternative names,
+# which can be tried if `GHOSTSCRIPT' cannot be found at run time.
+ALT_GHOSTSCRIPT_PROGS=@ALT_GHOSTSCRIPT_PROGS@
+
+# Similarly, `ALT_AWK_PROGS' specifies a list of alternative names,
+# which can be tried at run time, to identify the awk program.
+ALT_AWK_PROGS=@ALT_AWK_PROGS@
+
 # Normally the Postscript driver, grops, produces output that conforms
 # to version 3.0 of the Adobe Document Structuring Conventions.
 # Unfortunately some spoolers and previewers can't handle such output.
@@ -135,6 +143,9 @@ exampledir=$(docdir)/examples
 # `htmldocdir' says where to install documentation in HTML format.
 htmldocdir=$(docdir)/html
 
+# `pdfdocdir' says where to install documentation in PDF format.
+pdfdocdir=$(docdir)/pdf
+
 # `fontdir' says where to install dev*/*.
 fontdir=$(datasubdir)/font
 
@@ -234,6 +245,11 @@ man7dir=$(manroot)/man$(man7ext)
 make_html=@make_html@
 make_install_html=@make_install_html@
 
+# The configure script also checks whether all necessary utility programs
+# for pdfroff are available -- only then we can build PDF documentation.
+make_pdfdoc=@make_pdfdoc@
+make_install_pdfdoc=@make_install_pdfdoc@
+
 # DEFINES should include the following:
 # -DHAVE_MMAP			if you have mmap() and <sys/mman.h>
 # -DARRAY_DELETE_NEEDS_SIZE	if your C++ doesn't understand `delete []'
@@ -378,6 +394,8 @@ PURIFYCCFLAGS=
 # copy of $(MDEFINES) when making individual directories; this could
 # cause the argument list to become too long on some systems.
 MDEFINES= \
+  "ALT_AWK_PROGS=$(ALT_AWK_PROGS)" \
+  "ALT_GHOSTSCRIPT_PROGS=$(ALT_GHOSTSCRIPT_PROGS)" \
   "AR=$(AR)" \
   "BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
   "CC=$(CC)" \
@@ -440,6 +458,7 @@ MDEFINES= \
   "fontpath=$(fontpath)" \
   "g=$(g)" \
   "htmldocdir=$(htmldocdir)" \
+  "pdfdocdir=$(pdfdocdir)" \
   "indexdir=$(indexdir)" \
   "indexext=$(indexext)" \
   "indexname=$(indexname)" \
@@ -451,6 +470,8 @@ MDEFINES= \
   "localtmacdir=$(localtmacdir)" \
   "make_html=$(make_html)" \
   "make_install_html=$(make_install_html)" \
+  "make_pdfdoc=$(make_pdfdoc)" \
+  "make_install_pdfdoc=$(make_install_pdfdoc)" \
   "man1dir=$(man1dir)" \
   "man1ext=$(man1ext)" \
   "man5dir=$(man5dir)" \
@@ -713,7 +734,7 @@ uninstall_dirs:
 	  $(tmacdir) $(systemtmacdir) $(localtmacdir) \
 	  $(fontdir) $(localfontdir) $(bindir) \
 	  $(datasubdir) $(dataprogramdir) $(datadir) $(infodir) \
-	  $(exampledir) $(htmldocdir) $(docdir) \
+	  $(exampledir) $(htmldocdir) $(pdfdocdir) $(docdir) \
 	  $(libprogramdir) $(libdir)
 
 .PHONY: check docheck