From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 5 Jan 2010 09:39:15 +0000 (+0000)
Subject: Add verification for fig2dev
X-Git-Tag: SVN~727
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9529257fc8532a56e76ce6972b4556154677ae31

Add verification for fig2dev

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6999 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/configure.ac b/configure.ac
index a34271458c..2ecf7eca95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 # A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
 
-AC_REVISION($Revision: 6267 $)
+AC_REVISION($Revision: 6998 $)
 AC_CANONICAL_TARGET
 AC_LANG([C])
 AC_PROG_CXX
@@ -453,7 +453,9 @@ AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
 
 # Check for doxygen when in maintainer mode which is helpful to build doc & dist
 AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
-AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x)
+AC_PATH_PROG(FIG2DEV,fig2dev,`which fig2dev`)
+AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x &&
+                            test x$FIG2DEV != x)
 
 # Can we rebuild the publication list from the bib file?
 AC_CHECK_PROG(BIBTEX,bibtex,`which flexml`,NOTFOUND)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3f31e88db7..e6ffaa1133 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,13 +22,13 @@ MAINTAINERCLEANFILES = html
 if MAINTAINER_MODE 
 if HAVE_DOXYGEN
 simgrid_modules.map: fig/simgrid_modules.fig
-	fig2dev -Lmap fig/simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
+	$(FIG2DEV) -Lmap fig/simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
 	sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | \
 	sed 's/<IMG /<IMG style="border:0px "/g' | sed 's/\.gif/.png/' \
 	> simgrid_modules.map
 
 %.png: fig/%.fig
-	fig2dev -Lpng $^ > $@
+	$(FIG2DEV) -Lpng $^ > $@
 
 html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) \
       html/gras.html html/amok.html html/msg.html html/simdag.html  \
@@ -40,13 +40,13 @@ html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) \
 	cp @srcdir@/webcruft/Paje_MSG_screenshot_thn.jpg @srcdir@/webcruft/Paje_MSG_screenshot.jpg html/
 	cp @srcdir@/simgrid.css html/
 	: # First pass
-	doxygen Doxyfile >/dev/null
+	$(DOXYGEN) Doxyfile >/dev/null
 	@top_srcdir@/tools/doxygen/index_create.pl simgrid.tag index-API.doc
 	@top_srcdir@/tools/doxygen/toc_create.pl \
 	   @srcdir@/FAQ.doc @srcdir@/index.doc @srcdir@/contrib.doc \
 	   @srcdir@/gtut-introduction.doc @srcdir@/history.doc
 	: # Second pass
-	doxygen Doxyfile >/dev/null
+	$(DOXYGEN) Doxyfile >/dev/null
 	: # Post-processing
 	rm -f html/dir* 
 	@top_srcdir@/tools/doxygen/index_php.pl @srcdir@/index.php.in html/index.html index.php