More checking: for programs and XML-related files. If some programs

aren't around (e.g. lynx) don't build the corresponding piece that
needs that.

diff --git a/doc/developer/Makefile b/doc/developer/Makefile
index 62e1c7c71bc4f1e4ced186eea4419bd405f0c8ab..fe12a8268d25b65be7494b9da2910a68634f4a31 100644 (file)
--- a/doc/developer/Makefile
+++ b/doc/developer/Makefile
@@ -19,11 +19,15 @@ MAX_TEX_RECURSION=4
 #JADE=openjade
 
 JADE=openjade
+LYNX=/usr/bin/lynx
+DVIPS=/usr/bin/dvips
+JADETEX=/usr/bin/jadetex
 
 XML_DECL=/usr/share/sgml/docbook/dsssl-stylesheets-1.76/dtds/decls/xml.dcl
 HTML_SS=/usr/share/sgml/docbook/dsssl-stylesheets-1.76/html/docbook.dsl
 PRINT_SS=/usr/share/sgml/docbook/dsssl-stylesheets-1.76/print/docbook.dsl
 
+DOCS=manual.html manual.txt manual.ps
 
 all: manual
 
@@ -40,16 +44,16 @@ manual.html: audio_output.xml debugging.xml decoders.xml gfdl.xml glossary.xml h
          -d $(HTML_SS) $(XML_DECL) manual.xml > $@
 
 manual.dvi: manual.tex modules.eps ps.eps stream.eps ts.eps
-       jadetex manual.tex
-       jadetex manual.tex
-       jadetex manual.tex
+       $(JADETEX) manual.tex
+       $(JADETEX) manual.tex
+       $(JADETEX) manual.tex
 
 manual.ps: manual.dvi
-       dvips -f $< > $@
+       $(DVIPS) -f $< > $@
 
 manual.txt: audio_output.xml debugging.xml decoders.xml gfdl.xml glossary.xml history.xml input.xml interface.xml manual.xml overview.xml ports.xml video_output.xml
        $(JADE) -t sgml -V nochunks -d $(HTML_SS) $(XML_DECL) manual.xml > dump.html
-       lynx -force_html -dump dump.html > $@
+       $(LYNX) -force_html -dump dump.html > $@
        -rm -f dump.html
 
 clean:

diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index 27d3a65cb602fcfd550b77b4a99884a339ad86a9..af74521e3fb9a377390907618566821be167eeb6 100644 (file)
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -19,11 +19,15 @@ MAX_TEX_RECURSION=4
 #JADE=openjade
 
 JADE=@JADE@
+LYNX=@LYNX@
+DVIPS=@DVIPS@
+JADETEX=@JADETEX@
 
 XML_DECL=@XML_DECL@
 HTML_SS=@HTML_SS@
 PRINT_SS=@PRINT_SS@
 
+DOCS=@DOCS@
 
 all: manual
 
@@ -40,16 +44,16 @@ manual.html: audio_output.xml debugging.xml decoders.xml gfdl.xml glossary.xml h
          -d $(HTML_SS) $(XML_DECL) manual.xml > $@
 
 manual.dvi: manual.tex modules.eps ps.eps stream.eps ts.eps
-       jadetex manual.tex
-       jadetex manual.tex
-       jadetex manual.tex
+       $(JADETEX) manual.tex
+       $(JADETEX) manual.tex
+       $(JADETEX) manual.tex
 
 manual.ps: manual.dvi
-       dvips -f $< > $@
+       $(DVIPS) -f $< > $@
 
 manual.txt: audio_output.xml debugging.xml decoders.xml gfdl.xml glossary.xml history.xml input.xml interface.xml manual.xml overview.xml ports.xml video_output.xml
        $(JADE) -t sgml -V nochunks -d $(HTML_SS) $(XML_DECL) manual.xml > dump.html
-       lynx -force_html -dump dump.html > $@
+       $(LYNX) -force_html -dump dump.html > $@
        -rm -f dump.html
 
 clean:

diff --git a/doc/developer/configure.ac b/doc/developer/configure.ac
index 08f9225ddc87f0ef25768cb9da17457d3b59bf48..f485f2dac7355c6d7bbdd1bef1dada6ab8987de3 100644 (file)
--- a/doc/developer/configure.ac
+++ b/doc/developer/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.1 2004/02/13 04:22:39 rocky Exp $
+dnl $Id: configure.ac,v 1.2 2004/02/13 11:33:38 rocky Exp $
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(manual.xml.in,0.0.1)
@@ -7,7 +7,26 @@ AC_CHECK_PROGS(JADE, openjade jade, [nogood])
 
 if test "$JADE" = nogood ; then
   AC_MSG_ERROR(You need jade to build the documentation. 
-  Get it http://openjade.sourceforge.net/)
+  Get it from http://openjade.sourceforge.net/)
+else
+  DOCS="manual.html"
+fi
+
+AC_PATH_PROG(LYNX, lynx, [nope])
+
+if test "$LYNX" = nope ; then
+  AC_MSG_WARN(Can not create text version of manual)
+else 
+  DOCS="$DOCS manual.txt"
+fi
+
+AC_PATH_PROG(DVIPS, dvips, [nodvips])
+AC_PATH_PROG(JADETEX, jadetex, [nojadetex])
+
+if test "$DVIPS" = nodvips -o "$JADETEX" = nojadetex ; then
+  AC_MSG_WARN(Can not create PostScript version of manual)
+else 
+  DOCS="$DOCS manual.ps"
 fi
 
 AC_CANONICAL_SYSTEM
@@ -46,29 +65,48 @@ if test -n "${xml_decl}"; then
    XML_DECL=$xml_decl
 fi
 
+if test ! -f $XML_DECL ; then
+  AC_MSG_ERROR(Can't find xml.dcl file. Set with --with-xml-dcl.)
+fi
+
+
 AC_ARG_WITH(html_ss,
 [  --with-html-ss=PATH    place to find html/docbook.dsl file])
 if test -n "${html_ss}"; then
    HTML_SS=$html_ss
 fi
 
+if test ! -f $HTML_SS ; then
+  AC_MSG_ERROR(Can't find html/docbook.dsl file. Set with --with-html-ss.)
+fi
+
 AC_ARG_WITH(print_ss,
 [  --with-print-ss=PATH    place to find print/docbook.dsl file])
 if test -n "${print_ss}"; then
    PRINT_SS=$print_ss
 fi
 
+if test ! -f $PRINT_SS ; then
+  AC_MSG_ERROR(Can't find print/docbook.dsl file. Set with --with-print-ss.)
+fi
+
 AC_ARG_WITH(docbook_dtd,
 [  --with-dockbook-dtd=PATH    place to find docbookx.dtd file])
 if test -n "${docbook_dtd}"; then
    DOCBOOKX_DTD=$docbook_dtd
 fi
 
+if test ! -f $DOCBOOKX_DTD ; then
+  AC_MSG_ERROR(Can't find docbook.dsl file. Set with --with-docbook_dtd.)
+fi
+
 AC_SUBST(XML_DECL)
 AC_SUBST(HTML_SS)
 AC_SUBST(PRINT_SS)
 AC_SUBST(DOCBOOKX_DTD)
 AC_SUBST(JADE)
+AC_SUBST(LYNX)
+AC_SUBST(DOCS)
 
 AC_CONFIG_FILES([manual.xml Makefile])
 AC_OUTPUT

diff --git a/doc/developer/manual.xml b/doc/developer/manual.xml
index 639acced36969862df8ec439ccc5a7f2b3c77ce9..2732921dcd5de03873d640a7e5a124dfabafa1f8 100644 (file)
--- a/doc/developer/manual.xml
+++ b/doc/developer/manual.xml
@@ -57,7 +57,7 @@
       <orgname> VideoLAN project </orgname>
     </affiliation>
   </collab>
-  <pubdate> $Id: manual.xml,v 1.7 2004/02/13 04:22:39 rocky Exp $ </pubdate>
+  <pubdate> $Id: manual.xml,v 1.8 2004/02/13 11:33:38 rocky Exp $ </pubdate>
   <copyright> <year> 2001 </year>
               <holder> Christophe Massiot, for IDEALX S.A.S. </holder>
   </copyright>