[Gnash-commit] gnash ./ChangeLog macros/docbook.m4 doc/C/Makef...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/03/20 19:54:30

Modified files:
        .              : ChangeLog 
        macros         : docbook.m4 
        doc/C          : Makefile.am 

Log message:
        * doc/C/Makefile.am: Optionally use dblatex or pdfxmltex to build
        PDFs if FOP doesn't exist.
        * macros/docbook.m4: Also look for dblatex and pdfxmltex.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.189&tr2=1.190&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.189 gnash/ChangeLog:1.190
--- gnash/ChangeLog:1.189       Mon Mar 20 01:02:19 2006
+++ gnash/ChangeLog     Mon Mar 20 19:54:29 2006
@@ -1,3 +1,9 @@
+2006-03-20  Rob Savoye  <address@hidden>
+
+       * doc/C/Makefile.am: Optionally use dblatex or pdfxmltex to build
+       PDFs if FOP doesn't exist.
+       * macros/docbook.m4: Also look for dblatex and pdfxmltex.
+
 2006-03-19  Rob Savoye  <address@hidden>
 
        * macros/gstreamer.m4: Look for Gstreamer.
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.13 gnash/doc/C/Makefile.am:1.14
--- gnash/doc/C/Makefile.am:1.13        Sun Mar 12 00:35:15 2006
+++ gnash/doc/C/Makefile.am     Mon Mar 20 19:54:29 2006
@@ -18,9 +18,9 @@
 #
 
 # Building a PDF using Apache FOP only works with fop-0.20.5 for now.
-if GHELP
-include $(top_srcdir)/doc/xmldocs.make
-endif
+# if GHELP
+# include $(top_srcdir)/doc/xmldocs.make
+# endif
 
 STYLESDIR = @docbook_styles@
 
@@ -86,7 +86,7 @@
 info: gnash.info
 gnash.pdf gnash.html gnash.texi: $(xml_files)
 
-SUFFIXES = .xml .html .texi .pdf .info .1
+SUFFIXES = .xml .html .texi .pdf .info .1 .fo
 
 EXTRA_DIST = \
        $(xml_files)            \
@@ -97,16 +97,29 @@
        gnash.html              \
        gnash.1
 
-.xml.html:
-if ENABLE_HTML
-       $(XSLTPROC) --output $@ --nonet $(STYLESDIR)/html/docbook.xsl $<
+if ENABLE_FOP
+.xml.pdf:
+       $(FOP) -xsl $(STYLESDIR)/fo/docbook.xsl -xml $< -pdf $@
+       touch $@
+else
+.xml.fo:
+if ENABLE_XMLTEX
+       $(XSLTPROC) --output $@ --nonet $(STYLESDIR)/fo/docbook.xsl $<
+else
+       touch $@
+endif
+.fo.pdf:
+if ENABLE_XMLTEX
+       $(PDFXMLTEX) $<
 else
        touch $@
 endif
+endif
 
-.xml.pdf:
-if ENABLE_FOP
-       $(FOP) -xsl $(STYLESDIR)/fo/docbook.xsl -xml $< -pdf $@
+
+.xml.html:
+if ENABLE_HTML
+       $(XSLTPROC) --output $@ --nonet $(STYLESDIR)/html/docbook.xsl $<
 else
        touch $@
 endif
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.14 gnash/macros/docbook.m4:1.15
--- gnash/macros/docbook.m4:1.14        Sat Mar 18 12:22:59 2006
+++ gnash/macros/docbook.m4     Mon Mar 20 19:54:29 2006
@@ -101,6 +101,12 @@
       AC_MSG_RESULT([$JAVA])
     fi
 
+    AC_PATH_PROG(PDFXMLTEX, pdfxmltex, [],
+       [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+
+    AC_PATH_PROG(DBLATEX, dblatex, [],
+       [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+
     AC_PATH_PROG(XSLTPROC, xsltproc, [],
        [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
 
@@ -128,6 +134,8 @@
   AM_CONDITIONAL(ENABLE_TEXI, [ test x"$DB2X_XSLTPROC" != x -a 
x"$DB2X_TEXIXML" != x -a x"$MAKEINFO" != x ])
   AM_CONDITIONAL(ENABLE_HTML, [ test x"$XSLTPROC" != x ])
   AM_CONDITIONAL(ENABLE_FOP, [ test x"$FOP" != x ])
+  AM_CONDITIONAL(ENABLE_XMLTEX, [ test x"$PDFXMLTEX" != x ])
+  AM_CONDITIONAL(ENABLE_DBLATEX, [ test x"$DBLATEX" != x ])
   AM_CONDITIONAL(ENABLE_MAN, [ test x"$DB2X_XSLTPROC" != x -a x"$DB2X_MANXML" 
!= x ])
   AC_SUBST(JAVA)