The grand Doxygen simplification

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f45d083..61903b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,8 +123,10 @@ AC_SUBST([GRAS_DEP])
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
-   GNOME_COMPILE_WARNINGS(yes)
+   # Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt]
+   enable_compile_warnings=yes
 fi
+SG_COMPILE_FLAGS
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
@@ -146,8 +148,8 @@ AC_PROG_FLEX(2.5.30)
 # Can we rebuild the xml-lexers from the XML specification?
 # if not, simply touch the flex source files (which are distributed in
 #  tarballs even if generated by flexml) and hope for the best.
-AC_CHECK_PROG(FLEXML,flexml,,NOTFOUND)
-AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != NOTFOUND)
+AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND)
+AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
 
 ###################
 ## Makes the output
@@ -169,7 +171,7 @@ AC_CONFIG_FILES([
       examples/gras/timer/Makefile examples/gras/timer/test_sg examples/gras/timer/test_rl
       examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
   doc/Makefile
-    doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
+    doc/Doxyfile
   tools/graspe-slave            tools/Makefile
     tools/gras/Makefile
   testsuite/Makefile
@@ -205,7 +207,7 @@ AC_OUTPUT
 
 echo "
 
-Configuration of package \`${PACKAGE}' on $gras_arch_name (=$gras_arch):
+Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (=$gras_arch):
 
        Compiler:       ${CC}