Do not require doxygen in maintainer mode

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

diff --git a/ChangeLog b/ChangeLog
index b43bef0..90781a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 SimGrid (3.4-svn) unstable; urgency=high
 
 SimGrid (3.4-svn) unstable; urgency=high
 

+ OVERALL CHANGES:
+  * Tested successfully on AIX
+

  GRAS:
   * fix a bug on struct sizeof computation, which prevented the
     exchange of arrays of structs in some conditions
  GRAS:
   * fix a bug on struct sizeof computation, which prevented the
     exchange of arrays of structs in some conditions


@@ -39,6 +42,9 @@ SimGrid (3.4-svn) unstable; urgency=high
     This allows to do more with the given exception afterward.
     Users should call xbt_ex_free() themselves.
   * Do not allow malloc(0) since that's not portable
     This allows to do more with the given exception afterward.
     Users should call xbt_ex_free() themselves.
   * Do not allow malloc(0) since that's not portable

+  
+ Build Chain:
+  * Do not require doxygen in maintainer mode

 
  -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr> 
 
 
  -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr> 
 

diff --git a/configure.ac b/configure.ac
index 31f5429..801af8c 100644 (file)
--- 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_CONFIG_HEADERS([src/gras_config.h])
 # A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
 

-AC_REVISION($Revision$)
+AC_REVISION($Revision: 6267 $)

 AC_CANONICAL_TARGET
 AC_LANG([C])
 AC_PROG_CXX
 AC_CANONICAL_TARGET
 AC_LANG([C])
 AC_PROG_CXX


@@ -460,9 +460,7 @@ then
    # Check for doxygen when in maintainer mode since dist* targets fail
    # without it
    AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
    # Check for doxygen when in maintainer mode since dist* targets fail
    # without it
    AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)

-   if test x$DOXYGEN = x ; then 
-     AC_MSG_ERROR([doxygen is mandatory in maintainer mode])
-   fi
+   AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x)

 fi
 
 # Can we extract really usable backtraces? (also need the popen function)
 fi
 
 # Can we extract really usable backtraces? (also need the popen function)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d189716..71ca562 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,8 @@ CLEANFILES = .*.toc
 DISTCLEANFILES = index-API.doc simgrid.tag
 MAINTAINERCLEANFILES = html
 
 DISTCLEANFILES = index-API.doc simgrid.tag
 MAINTAINERCLEANFILES = html
 

-if MAINTAINER_MODE
+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 | \
        sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | \
 simgrid_modules.map: fig/simgrid_modules.fig
        fig2dev -Lmap fig/simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
        sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | \


@@ -67,6 +68,7 @@ html/simdag.html:
 publish:
        $(MAKE) -C .. sync-gforge
 endif
 publish:
        $(MAKE) -C .. sync-gforge
 endif

+endif

 
 ./logcategories.doc: $(DOCSOURCES)
        pwd=`pwd`; rm -f $$pwd/logcategories.doc; set -e; \
 
 ./logcategories.doc: $(DOCSOURCES)
        pwd=`pwd`; rm -f $$pwd/logcategories.doc; set -e; \