Use dia to generate png images out of dia files

(This used to be commit a46ab88b44)

docs/Makefile.in

@@ -12,6 +12,7 @@ DVIPS = @DVIPS@
 PNGTOPNM = @PNGTOPNM@
 EPSTOPNM = @EPSTOPNM@
 PNMTOPNG = @PNMTOPNG@
+DIA = @DIA@
 PNMTOPS = @PNMTOPS@
 HTML2TEXT = @HTML2TEXT@
 PLUCKERBUILD = @PLUCKERBUILD@
@@ -166,6 +167,7 @@ $(PDFDIR)/%.pdf: %.pdf
 
 # Adobe PDF files
 %.pdf: %.tex %.ind latexfigures 
+	$(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".png" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
 	-$(PDFLATEX) $<
 	$(THUMBPDF) $*.pdf
 	-$(PDFLATEX) $<
@@ -178,9 +180,9 @@ $(DVIDIR)/%.dvi: %.dvi
 %.dvi: %.tex %.idx 
 	$(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
 	-$(LATEX) $< 
-	-$(LATEX) $< 
-	$(MAKEINDEX) $*.idx
-	-$(LATEX) $< 
+
+%.png: %.dia
+	$(DIA) -e $@ $<
 
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@

docs/configure.in

@@ -40,6 +40,7 @@ AC_SUBST(SAMBASOURCEDIR)
 
 DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
 DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
+DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, ALL)
 DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX)
 DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF)
 DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF)

docs/scripts/copy-images.sh

@@ -6,6 +6,7 @@ TO="$4"
 
 for x in `xsltproc --stringparam prepend "" --stringparam append "" --stringparam role "$ROLE" xslt/find-image-dependencies.xsl "$XMLFILE"`
 do
+	test -f $FROM/$x || make $FROM/$x || exit 1
 	cp -u $FROM/$x $TO/$x || exit 1
 done
 exit