[tracker/tracker-0.14] build: don't build-depend on Dia

[Martyn James Russell <mr src gnome org>]

commit d0d492b794445c6b797ce7ceb4d3da2042d1f95e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Nov 13 17:08:54 2012 -0500

    build: don't build-depend on Dia
    
    Currently, the gtk-doc generator code in Tracker has a build dependency
    on the Dia application in order to generate some images for the
    documentation; the dependency is not optimal, as Dia is not available
    on all distributions and platforms.
    
    This patch changes the build system to add a specific update-diagrams
    make target to be ran from the ontology docs directory (which updates
    the images), and adds the images themselves under version control.
    
    Fixes GB#688287

 configure.ac                                       |    8 --------
 docs/reference/ontology/.gitignore                 |    8 --------
 docs/reference/ontology/Makefile.am                |    4 ++--
 .../ontology/email-mimeparts-overview.png          |  Bin 0 -> 19019 bytes
 docs/reference/ontology/feeds-overview.png         |  Bin 0 -> 69443 bytes
 docs/reference/ontology/images-overview.png        |  Bin 0 -> 73835 bytes
 docs/reference/ontology/location-overview.png      |  Bin 0 -> 57409 bytes
 docs/reference/ontology/message-class-overview.png |  Bin 0 -> 32467 bytes
 docs/reference/ontology/notation.png               |  Bin 0 -> 9906 bytes
 docs/reference/ontology/overview.png               |  Bin 0 -> 19004 bytes
 docs/reference/ontology/radio-overview.png         |  Bin 0 -> 27253 bytes
 11 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 54f00ad..3d3b949 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,14 +598,6 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 ])
 
 if test "x$enable_gtk_doc" != xno; then
-   # Check for dia if we are building gtk_doc
-   AC_PATH_PROG(DIA, dia)
-   AC_SUBST(DIA)
-
-   if test -z "$DIA"; then
-      AC_MSG_ERROR([Could not find Dia tool required to build documentation.])
-   fi
-
    # Check for graphviz if we are building gtk_doc
    AC_PATH_PROG(GRAPHVIZ_FDP, fdp)
    AC_SUBST(GRAPHVIZ_FDP)
diff --git a/docs/reference/ontology/.gitignore b/docs/reference/ontology/.gitignore
index a8527c1..ff66460 100644
--- a/docs/reference/ontology/.gitignore
+++ b/docs/reference/ontology/.gitignore
@@ -1,11 +1,3 @@
 *-ontology.xml
 fts-properties.xml
-email-mimeparts-overview.png
-feeds-overview.png
-images-overview.png
-location-overview.png
-message-class-overview.png
-notation.png
 ontology.png
-overview.png
-radio-overview.png
diff --git a/docs/reference/ontology/Makefile.am b/docs/reference/ontology/Makefile.am
index 55886a6..a042abb 100644
--- a/docs/reference/ontology/Makefile.am
+++ b/docs/reference/ontology/Makefile.am
@@ -26,8 +26,8 @@ ONTOLOGY_DIAGRAMS =                                    \
 ONTOLOGY_DIAGRAMS_PNG = $(notdir $(ONTOLOGY_DIAGRAMS:.dia=.png))
 
 # DIA to PNG conversion
-$(ONTOLOGY_DIAGRAMS_PNG): $(ONTOLOGY_DIAGRAMS)
-	$(AM_V_GEN) $(DIA) -t png $^ 2>/dev/null
+update-diagrams: $(ONTOLOGY_DIAGRAMS)
+	$(AM_V_GEN) dia -t png $^ 2>/dev/null
 
 # The original Ontology explanation files
 ONTOLOGY_EXPLANATIONS =                                \
diff --git a/docs/reference/ontology/email-mimeparts-overview.png b/docs/reference/ontology/email-mimeparts-overview.png
new file mode 100644
index 0000000..d5b2b72
Binary files /dev/null and b/docs/reference/ontology/email-mimeparts-overview.png differ
diff --git a/docs/reference/ontology/feeds-overview.png b/docs/reference/ontology/feeds-overview.png
new file mode 100644
index 0000000..cd4a50a
Binary files /dev/null and b/docs/reference/ontology/feeds-overview.png differ
diff --git a/docs/reference/ontology/images-overview.png b/docs/reference/ontology/images-overview.png
new file mode 100644
index 0000000..268a446
Binary files /dev/null and b/docs/reference/ontology/images-overview.png differ
diff --git a/docs/reference/ontology/location-overview.png b/docs/reference/ontology/location-overview.png
new file mode 100644
index 0000000..cfce18d
Binary files /dev/null and b/docs/reference/ontology/location-overview.png differ
diff --git a/docs/reference/ontology/message-class-overview.png b/docs/reference/ontology/message-class-overview.png
new file mode 100644
index 0000000..606edf2
Binary files /dev/null and b/docs/reference/ontology/message-class-overview.png differ
diff --git a/docs/reference/ontology/notation.png b/docs/reference/ontology/notation.png
new file mode 100644
index 0000000..b304c1c
Binary files /dev/null and b/docs/reference/ontology/notation.png differ
diff --git a/docs/reference/ontology/overview.png b/docs/reference/ontology/overview.png
new file mode 100644
index 0000000..c632af7
Binary files /dev/null and b/docs/reference/ontology/overview.png differ
diff --git a/docs/reference/ontology/radio-overview.png b/docs/reference/ontology/radio-overview.png
new file mode 100644
index 0000000..43cf589
Binary files /dev/null and b/docs/reference/ontology/radio-overview.png differ