Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Setup the devel of v3.3.5, just in case anyone gets bored before new year ;)
[simgrid.git] / configure.ac
index 543696b..a342714 100644 (file)
@@ -1,28 +1,55 @@
+dnl Copyright (C) 2004-2007. The SimGrid team. All rights reserved.
+
+dnl This file is part of the SimGrid project. This is free software:
+dnl You can redistribute and/or modify it under the terms of the
+dnl GNU LGPL (v2.1) licence.
 
 ######################
 ## Setup the autotools
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.2-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.3.5-svn],[simgrid-devel@lists.gforge.inria.fr])
 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$)
+AC_REVISION($Revision: 6267 $)
 AC_CANONICAL_TARGET
 AC_LANG([C])
+AC_PROG_CXX
+AM_PROG_GCJ
 
-AM_INIT_AUTOMAKE(gnu)
+AM_INIT_AUTOMAKE([gnu -Wno-portability])
 AC_CONFIG_MACRO_DIR(acmacro) 
 ACLOCAL="$ACLOCAL -I acmacro"
+
+dnl Next few lines is a hack to prevent libtool checking for F77
+m4_undefine([AC_PROG_F77])
+m4_defun([AC_PROG_F77],[])
+
+dnl We do build a proper DLL when using win32
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
 ###############
+## SVN version check
+##
+if test -e .svn && echo $VERSION | grep -q svn; then
+  VERSION="$VERSION-r`svnversion`"
+  PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
+  PACKAGE_STRING="$PACKAGE_STRING r`svnversion`"
+else if test -e .git && echo $VERSION | grep -q svn; then
+  ver=`git log --oneline -1 | sed 's| .*||'`
+  VERSION=`echo "$VERSION-r$ver" | sed 's/svn/git/'`
+  PACKAGE_VERSION=`echo "$PACKAGE_VERSION-r$ver" | sed 's/svn/git/'`
+  PACKAGE_STRING=`echo "$PACKAGE_STRING r$ver" | sed 's/svn/git/'`
+fi fi
+
+###############
 ## System checks
 ##
-SG_CONFIGURE_PART(System checks...)
+SG_CONFIGURE_PART([System checks...])
 AC_PROG_CC(xlC gcc cc)
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
@@ -44,14 +71,38 @@ AC_CHECK_FUNCS([gettimeofday usleep \
                 sysconf\
                 readv\
                popen\
-               signal\
-               getline])
-                
+               signal])
+  
+dnl GNU systems before POSIX2008 need the _GNU_SOURCE definition to find getline (and simgrid does pass this)             
+AC_MSG_CHECKING(a usable getline)
+AC_LINK_IFELSE([
+    #define _GNU_SOURCE
+    #include <stdio.h>
+    int main(void){
+      FILE * fp;
+      char * line = NULL;
+      size_t len = 0;
+      getline(&line, &len, fp);
+    }
+  ],[
+    AC_MSG_RESULT(found)
+  ],[
+    AC_SUBST(need_getline, ["#define SIMGRID_NEED_GETLINE 1 /* enable the getline replacement*/"])
+    AC_DEFINE(SIMGRID_NEED_GETLINE, 1, enable the getline replacement)
+    AC_MSG_RESULT(not found (activating internal implementation))
+  ])
+              
 # check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
 AC_FUNC_SNPRINTF
 # check for asprintf function familly (or request the replacements from xbt/snprintf.c)
-AC_CHECK_FUNC(  asprintf, :,   AC_DEFINE(NEED_ASPRINTF,  1,  enable the asprintf   replacement))
-AC_CHECK_FUNC( vasprintf, :,   AC_DEFINE(NEED_VASPRINTF, 1,  enable the vasprintf  replacement))
+AC_CHECK_FUNC(  asprintf, :,[
+    AC_DEFINE(NEED_ASPRINTF,  1,  enable the asprintf replacement)
+    AC_SUBST(need_asprintf, ["#define SIMGRID_NEED_ASPRINTF 1 /* enable the asprintf replacement */"]) 
+   ])
+AC_CHECK_FUNC( vasprintf, :,[
+    AC_DEFINE(NEED_VASPRINTF, 1,  enable the vasprintf replacement)
+    AC_SUBST(need_vasprintf, ["#define SIMGRID_NEED_VASPRINTF 1 /*enable the vasprintf replacement */"]) 
+   ])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -73,26 +124,68 @@ dnl ##
 dnl ##  CONTEXT IMPLEMENTATION
 dnl ##
 
-SG_CONFIGURE_PART([Checking for threads, contexts or assimilated...])
+SG_CONFIGURE_PART([Checking threads, contexts or assimilated...])
 
 dnl #
 dnl #  1. determine possibilities
 dnl #
 
-dnl #  check for MCSC method
+dnl #  check for MCSC method (ucontexts)
 AC_CHECK_MCSC(mcsc=yes, mcsc=no) 
 
 dnl #  check for pthread method
 AC_CHECK_HEADERS([pthread.h])
 AC_CHECK_LIB(pthread,pthread_create,pthread=yes, pthread=no)
 
+if test x$pthread = xyes ; then
+  AC_CHECK_LIB(pthread, sem_init, HAVE_SEM_INIT=yes, HAVE_SEM_INIT=no)
+  if test ${HAVE_SEM_INIT} = yes ; then
+     AC_MSG_CHECKING(if sem_init is compilable)
+     AC_TRY_COMPILE([#include <semaphore.h>],
+                   [sem_t s; sem_init(&s);], HAVE_SEM_INIT=yes, HAVE_SEM_INIT=no)
+     if test ${HAVE_SEM_INIT} = yes ; then
+        AC_DEFINE([HAVE_SEM_INIT],1,[Define if sem_init() is avaible or not (part of XPG6 standard only)])
+        AC_MSG_RESULT(yes)
+     else
+       AC_MSG_RESULT(no)
+     fi
+  fi
+  AC_CHECK_LIB(pthread, sem_timedwait, HAVE_SEM_TIMEDWAIT=yes, HAVE_SEM_TIMEDWAIT=no)
+  if test ${HAVE_SEM_TIMEDWAIT} = yes ; then
+     AC_MSG_CHECKING(if sem_timedwait is compilable)
+     AC_TRY_COMPILE([#include <semaphore.h>],
+                   [sem_t *s; const struct timespec * t; sem_timedwait(s, t);], HAVE_SEM_TIMEDWAIT=yes, HAVE_SEM_TIMEDWAIT=no)
+     if test ${HAVE_SEM_TIMEDWAIT} = yes ; then
+        AC_DEFINE([HAVE_SEM_TIMEDWAIT],1,[Define if sem_timedwait() is avaible or not (part of XPG6 standard only)])
+        AC_MSG_RESULT(yes)
+     else
+       AC_MSG_RESULT(no)
+     fi
+  fi
+
+  AC_CHECK_LIB(pthread, pthread_mutex_timedlock, HAVE_MUTEX_TIMEDLOCK=yes, HAVE_MUTEX_TIMEDLOCK=no)
+  if test ${HAVE_MUTEX_TIMEDLOCK} = yes ; then
+     AC_MSG_CHECKING(if pthread_mutex_timedlock is compilable)
+     AC_TRY_COMPILE([#include <pthread.h>],
+                   [pthread_mutex_t s; const struct timespec t; sem_timedlock(&s, &t);], HAVE_MUTEX_TIMEDLOCK=yes, HAVE_MUTEX_TIMEDLOCK=no)
+     if test ${HAVE_MUTEX_TIMEDLOCK} = yes ; then
+        AC_DEFINE([HAVE_MUTEX_TIMEDLOCK],1,[Define if pthread_mutex_timedlock() is avaible or not (part of XPG6 standard only?)])
+        AC_MSG_RESULT(yes)
+     else
+       AC_MSG_RESULT(no)
+     fi
+  fi
+fi
+
 dnl #
 dnl #  2. make a general decision
 dnl #
 
 if test ".$mcsc" = .yes; then
+   # ucontext found
    mcsc=yes
 elif test ".$pthread" = .yes; then
+   # ucontext not found, but pthread found
    pthread=yes
 else
     ac_header=windows.h
@@ -103,6 +196,8 @@ else
       AC_ERROR([no appropriate backend found])
     fi
 fi
+AM_CONDITIONAL(IS_WINDOWS,test x$windows_context = xyes)
+
 
 dnl #
 dnl #  3. allow decision to be overridden by user
@@ -111,6 +206,7 @@ dnl #
 AC_MSG_CHECKING(what kind of backend should we use)
 
 AC_ARG_WITH(pthread, [  --with-pthread   Use pthread instead of ucontext.],with_context=pthread)
+AC_ARG_WITH(pthread, [  --with-pthreads   Use pthread instead of ucontext.],with_context=pthread)
 
 AC_ARG_WITH(context,
   [  --with-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=auto]].],,
@@ -123,6 +219,7 @@ fi
 case $with_context in
  ucontext) ;;
  pthread) ;;
+ pthreads) ;;
  windows) ;;
  auto) with_context=ucontext;;
  *) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;;
@@ -131,7 +228,8 @@ esac
 if test "x$with_context" = "xucontext" ; then
   if test ".$mcsc" = .yes; then
     AC_MSG_RESULT(found working ucontext. Great!)
-    AC_DEFINE([USE_UCONTEXT],1,[Define if we use ucontext or not])
+    AC_DEFINE([CONTEXT_UCONTEXT],1,[Define if xbt contexts are based on ucontext or not])
+    AC_CHECK_HEADERS([valgrind/valgrind.h])
   else
     if test ".$windows_context" = .yes ; then
       AC_MSG_RESULT(use windows context portability layer.)
@@ -144,12 +242,13 @@ if test "x$with_context" = "xucontext" ; then
 fi
 
 if test "x$with_context" = "xpthread"; then
-  AC_CHECK_HEADERS([pthread.h])
-  AC_CHECK_LIB(pthread,pthread_create,,
-    [AC_MSG_ERROR([[Cannot find pthreads (try --with-context=ucontext if you haven't already tried).]])])
-  AC_DEFINE([USE_PTHREADS],1,[Define if we use pthreads or not])
-  AC_MSG_RESULT(You have pthreads. Let's use them.)
+  if test x$pthread != xyes ; then # reuse previous checks
+    AC_MSG_ERROR([[Cannot find pthreads (try --with-context=ucontext if you haven't already tried).]])
+  fi
+  AC_DEFINE([CONTEXT_THREADS],1,[Define if xbt contexts are based on our threads implementation or not])
+  AC_MSG_RESULT(You have pthreads and requested for them. Fine.)
 fi
+AM_CONDITIONAL(CONTEXT_THREADS,test "x$with_context" != xucontext)
 
 dnl #
 dnl #  4. determine a few additional details
@@ -168,22 +267,6 @@ dnl #  direction of stack grow
   AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext)
 fi
 
-
-#########################################
-## Build optional modules (simix)
-##
-SG_CONFIGURE_PART(Optional modules)
-AC_ARG_ENABLE(simix,
-  AS_HELP_STRING([--enable-simix], [Use the new SimIX module (default=no)]),
-  enable_simix=$enableval,enable_simix=no)
-if test "x$enable_simix" = "xyes" ; then
-  AC_MSG_RESULT("***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****")
-  AC_DEFINE(USE_SIMIX, 1, [Indicates whether we should use SimIX or not])
-else 
-  AC_MSG_RESULT(Eventually you will come to SimIX: x$enable_simix)
-fi
-AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
-
 #########################################
 ## Check for libraries extra-dependencies
 ##
@@ -191,22 +274,60 @@ AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
 SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 
 SIMGRID_DEP=""
+SMPI_DEP=""
 GRAS_DEP=""
-AC_CHECK_LIB(pthread,pthread_create,SIMGRID_DEP="-lpthread"; GRAS_DEP="-lpthread")
-
-AC_MSG_CHECKING(for csdp)
-sdp=no
-AC_CHECK_LIB(sdp,sdp,csdp=yes, csdp=no,-llapack -lblas -lm)
-if test "x$csdp" = xyes; then 
-  SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm"
-  AC_MSG_RESULT(Found working sdp library.)
-  AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not])
-else
-  AC_MSG_RESULT(Could not find any working sdp library.)
-fi;
-AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno)
+
+if test xpthread=xyes ; then 
+  # if the pthreads are usable
+  if test "x$with_context" = "xpthread" ; then
+    # if we use them to implement the xbt_context
+    SIMGRID_DEP="-lpthread"
+  fi
+  # we need them in any case for the gras lib (which is multithreaded), but on windows (of course)
+  if test "x$with_context" != "xwindows" ; then
+    GRAS_DEP="-lpthread"
+  fi
+fi
+AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris
+
+#########################################
+## Build optional modules (gtnets)
+##
+gtnets=no
+AC_ARG_WITH(gtnets,
+  AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]),
+  gtnets_path="$withval",gtnets_path="no")
+if test "x$gtnets_path" = "xno" ; then
+  AC_MSG_RESULT(Eventually you will come to GTNetS.)
+else  
+  AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****)
+  AC_MSG_CHECKING(for gtnets)
+  AC_LANG_PUSH([C++])  
+  GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib"
+  GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
+  LDFLAGS_SAV=$LDFLAGS 
+  CPPFLAGS_SAV=$CPPFLAGS
+  CPPFLAGS+=$GTNETS_CPPFLAGS
+  LDFLAGS+=$GTNETS_LDFLAGS
+  AC_TRY_LINK([ #include <simulator.h>
+              ], [Simulator s; s.RunUntilNextCompletion();], gtnets=yes, gtnets=no)
+  CPPFLAGS=$CPPFLAGS_SAV
+  LDFLAGS=$LDFLAGS_SAV
+  AC_LANG_POP([C++])  
+fi
+
+if test "x$gtnets" = "xyes" ; then
+  AC_MSG_RESULT(Enabling GTNETS support.)
+  AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support])
+  LDFLAGS+="-lgtnets -L$gtnets_path/lib"
+  CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
+fi
+AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno")
+
+
 
 AC_SUBST([SIMGRID_DEP])
+AC_SUBST([SMPI_DEP])
 
 AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"])
 AC_CHECK_LIB(socket, connect,    [GRAS_DEP="$GRAS_DEP -lsocket"])
@@ -214,9 +335,12 @@ AC_CHECK_LIB(socket, connect,    [GRAS_DEP="$GRAS_DEP -lsocket"])
 AC_MSG_CHECKING(for extra dependencies of libgras)
 case $host_os in
   *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32";
-            AC_SUBST(AM_CFLAGS,-DDLL_EXPORT);;
+            AM_CPPFLAGS="$AM_CPPFLAGS -DDLL_EXPORT"
+            AC_DEFINE(CONTEXT_THREADS,1);;
 esac
-          
+
+
+
 if test "x$GRAS_DEP" = x; then 
    AC_MSG_RESULT(none)
 else
@@ -224,7 +348,6 @@ else
 fi
 AC_SUBST([GRAS_DEP])
 
-
 ##############################################
 ## Enhance maintainer mode and SUBST variables
 ## (must be placed after any compilation tests since our overprotective flags
@@ -239,28 +362,79 @@ then
 fi
 AM_CONDITIONAL(GRAMINE_MODE,test x$gramine_mode != xno)
 
-
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
    # Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt]
-   enable_compile_warnings=yes   
+   force_compile_warnings=yes   
 fi
 SG_COMPILE_FLAGS
 
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
+##
+## Support for the supernovae compilation mode
+##
+AC_ARG_ENABLE(supernovae,
+              AS_HELP_STRING([--enable-supernovae],[Put the whole library in one compilation unit only to help gcc optimizing the code]),
+             [supernovae=$enableval],
+             [supernovae=no])
+AM_CONDITIONAL(SUPERNOVAE_MODE, test x$supernovae != xno)
+
+AC_SUBST([CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([LDFLAGS])
+AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([abs_builddir])
 AC_SUBST([abs_srcdir])
 AC_SUBST([abs_top_builddir])
 AC_SUBST([abs_top_srcdir])
 
+##############################################
+## Specific mode for build daemons.
+## (they compile the SVN without having the autotools installed)
+AC_ARG_ENABLE(botbuild,
+             AS_HELP_STRING([--enable-botbuild], [Compilation mode for build daemons -- do not use it]),
+              botbuild=$enableval,botbuild=no)
+AM_CONDITIONAL(BOTBUILD_MODE,test x$botbuild != xno)
+
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes ; then
+  echo "ERROR: "
+  echo "ERROR: You have to enable the maintainer mode to compile the SVN."
+  echo "ERROR: For this, just call configure this way:"
+  echo "ERROR:"
+  echo "ERROR: ./configure '--enable-maintainer-mode' $ac_configure_args"
+  echo "ERROR:"
+  exit 1
+fi
+
+
+SG_CONFIGURE_PART(Checking Java bindings...)
+# Java cruft
+AC_ARG_ENABLE(java,
+             AS_HELP_STRING([--disable-java], [To not compile the Java bindings even if the tools are found]),
+             disable_java=$enableval,disable_java=yes)
+if test "x$disable_java" != "xyes" ; then
+   use_java="disabled by user"
+else
+  AC_PATH_PROG([JAVAC], [javac], `which javac`)
+  AC_PATH_PROG([JAVA],  [java] , `which java`)
+  AC_PATH_PROG([JAR],   [jar]  , `which jar`)
+  AC_CHECK_HEADERS(jni.h)
+  if test -n "$JAVAC" && test -n "$JAVA" && test -n "$JAR" && test "x$ac_cv_header_jni_h" = "xyes" ; then
+     use_java="yes"
+     AC_DEFINE(HAVE_JAVA,1, [defines whether Java bindings must be compiled or not])
+  else   
+     use_java="no"
+  fi
+fi
+AC_MSG_RESULT(decide whether to compile java bindings... $use_java)
+AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
+
+
 #####################
 ## Check for programs
 ##
 
-SG_CONFIGURE_PART(Check for programs...)
+SG_CONFIGURE_PART(Checking programs...)
 AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
@@ -277,14 +451,34 @@ AC_PROG_FLEX(2.5.30)
 AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND)
 AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
 
-if test x$USE_MAINTAINER_MODE = xyes 
-then
-   # 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
+# 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)
+
+# Can we rebuild the publication list from the bib file?
+AC_CHECK_PROG(BIBTEX,bibtex,`which flexml`,NOTFOUND)
+AC_CHECK_PROG(BIBTOOL,bibtool,`which bibtool`,NOTFOUND)
+AC_CHECK_PROG(ICONV,iconv,`which iconv`,NOTFOUND)
+AC_CHECK_PROG(BIBTEX2HTML,bibtex2html,`which bibtex2html`,NOTFOUND)
+
+BIBTEX2HTML_VER="date"
+if test "x$BIBTEX2HTML" != "xNOTFOUND" ; then
+   BIBTEX2HTML_VER=`$BIBTEX2HTML --help 2>&1 | grep date`
+fi;
+
+AC_MSG_CHECKING(whether you have the right bibtex2html and will be able to build HTML files from the bibtex file)
+AM_CONDITIONAL(HAVE_BIBTEX2HTML,test "x$BIBTEX2HTML_VER" == "x"     &&
+                               test "x$BIBTEX2HTML" != "xNOTFOUND" &&
+                               test "x$BIBTOOL" != "xNOTFOUND"     &&
+                               test "x$ICONV" != "xNOTFOUND"         )
+
+if test "x$BIBTEX2HTML_VER" == "x"     &&
+                               test "x$BIBTEX2HTML" != "xNOTFOUND" &&
+                               test "x$BIBTOOL" != "xNOTFOUND"     &&
+                               test "x$ICONV" != "xNOTFOUND"; then
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_RESULT(no)
 fi
 
 # Can we extract really usable backtraces? (also need the popen function)
@@ -294,15 +488,10 @@ if test x$ADDR2LINE != x ; then
 fi
 
 AC_SUBST(ac_configure_args)
+AC_DEFINE_UNQUOTED(AC_CONFIGURE_ARGS,"$ac_configure_args",[Arguments passed to the configure script])
 # Can we make status line about the compilation result?
-AC_CHECK_PROG(MD5SUM,md5sum,`which md5sum`)
-if test x$MD5SUM != xno ; then
-  build_version=`find -name '*.[ch]' |grep -v src/ucontext_stack.h | grep -v src/gras_config.h |\ 
-                 xargs cat| $MD5SUM | sed 's/ .*$//'`
-else 
-  build_version="no_md5sum_binary"
-fi
-build_id="$PACKAGE ver=$VERSION build=$build_version args=\"$ac_configure_args\""
+dnl A C_CHECK_PROG(MD5SUM,md5sum,`which md5sum`)
+build_id="$PACKAGE ver=$VERSION args=\"$ac_configure_args\""
 AC_SUBST(build_id)
 
 ###################
@@ -321,16 +510,18 @@ SG_CONFIGURE_PART(Generating files...)
 AC_CONFIG_FILES([
   Makefile
   include/Makefile
+  include/simgrid_config.h
   src/Makefile
-  src/ucontext_stack.h
+  src/context_sysv_config.h
 ])
 
 # Tools being embeeded in gramine (stub generator)
 AC_CONFIG_FILES([
   tools/Makefile
     tools/gras/Makefile
+    tools/tesh/Makefile
 ])
-dnl tools/tesh/Makefile
+#    tools/tesh2/Makefile
 
 
 # GRAMINE_CUT_BEGIN
@@ -341,26 +532,32 @@ AC_CONFIG_FILES([
 ],[
     for file in                                                 \
      tools/graspe-slave           tools/graspe-master           \
+     checkall                     examples/java/runtest         \
+     src/mk_supernovae.sh                                       \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
 ])
 
-# Testsuite
+# build tools && Testsuite
 
 AC_CONFIG_FILES([  
+  buildtools/Makefile
   testsuite/Makefile
   testsuite/run_tests    
-  testsuite/gras/trp_tcp_usage  testsuite/gras/trp_file_usage
 ],[
     for file in                                                 \
      testsuite/run_tests                                        \
-     testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
 ])
 
+# Teshsuite (testsuite using tesh)
+AC_CONFIG_FILES([  
+  teshsuite/Makefile
+])
+
 # Documentation
 AC_CONFIG_FILES([
   doc/Makefile
@@ -369,59 +566,51 @@ AC_CONFIG_FILES([
 
 # Examples
 
+#      examples/gras/p2p/Makefile
+#      examples/gras/p2p/chord/Makefile
+#      examples/gras/p2p/can/Makefile
+
+AC_CONFIG_FILES([
+    examples/java/Makefile
+      examples/java/basic/Makefile
+      examples/java/comm_time/Makefile
+      examples/java/suspend/Makefile
+      examples/java/ping_pong/Makefile
+])
+
 AC_CONFIG_FILES([
   examples/Makefile 
-    examples/msg/Makefile           examples/msg/run_msg_test
-    examples/simdag/Makefile       examples/simdag/test_simdag
-    examples/gras/Makefile 
-      examples/gras/ping/Makefile   examples/gras/ping/test_sg   examples/gras/ping/test_rl
-      examples/gras/rpc/Makefile    examples/gras/rpc/test_sg    examples/gras/rpc/test_rl
-      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
-      examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl
-      examples/gras/mmrpc/Makefile  examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl
-      examples/gras/pmm/Makefile    examples/gras/pmm/test_sg    examples/gras/pmm/test_rl
-      examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl
-
-      examples/gras/p2p/Makefile
-      examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl
-      examples/gras/p2p/can/Makefile   examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl
-      
+    examples/msg/Makefile
+    examples/simdag/Makefile
+    examples/gras/Makefile
+      examples/gras/ping/Makefile   
+      examples/gras/rpc/Makefile
+      examples/gras/spawn/Makefile
+      examples/gras/synchro/Makefile
+      examples/gras/timer/Makefile
+      examples/gras/properties/Makefile
+      examples/gras/chrono/Makefile
+      examples/gras/mutual_exclusion/simple_token/Makefile
+      examples/gras/mmrpc/Makefile
+      examples/gras/pmm/Makefile
+      examples/gras/all2all/Makefile
     examples/amok/Makefile       
-      examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
-      examples/amok/saturate/Makefile  examples/amok/saturate/test_sg  examples/amok/saturate/test_rl
+    examples/smpi/Makefile       
+])
+#      examples/gras/replay/Makefile
+
+AC_CONFIG_FILES([
+  src/smpi/smpicc
+  src/smpi/smpirun
 ],[
     for file in                                                 \
-     \
-     examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
-     examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
-     \
-     examples/gras/ping/test_sg   examples/gras/ping/test_rl    \
-     examples/gras/rpc/test_sg    examples/gras/rpc/test_rl     \
-     examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
-     examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
-     examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl  \
-     examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl   \
-     examples/gras/pmm/test_sg    examples/gras/pmm/test_rl     \
-     examples/gras/all2all/test_sg  examples/gras/all2all/test_rl   \
-     examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl  \
-     examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl  \
-     examples/msg/run_msg_test                                  \
-     examples/simdag/test_simdag                               \
+      src/smpi/smpicc                                           \
+      src/smpi/smpirun                                          \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
 ])
 
-#     examples/gras/chord/test_sg  examples/gras/chord/test_rl   \
-#    examples/gras/pastry/test_sg   
-
-
-
-#    examples/gras/saturate/Makefile  examples/gras/saturate/test_sg
-#    examples/gras/alnem/Makefile     examples/gras/alnem/test_sg
-
-
 # GRAMINE_CUT_END
 
 AC_OUTPUT
@@ -437,16 +626,26 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
        LDFlags:         ${LDFLAGS}
 
        Context backend: ${with_context}
+       Compile Java:    ${use_java}
+       
+       Maintainer mode: ${USE_MAINTAINER_MODE}
+       Supernovae mode: ${supernovae}
+
 "
+if test x$botbuild = xyes ; then
+  echo "        This is a bot build. Do not specify --enable-botbuild if you are not a bot."
+  echo
+fi
 
-if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = xyes ; then
+  echo "WARNING: "
+  echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. "
+  echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead."
   echo "WARNING:"
-  echo "WARNING: you seem to compile the CVS version without the maintainer mode."
-  echo "WARNING: You may want to enable this by specifying:"
-  echo "WARNING:"
-  echo "WARNING: ./configure --enable-maintainer-mode  $ac_configure_args"
+  echo "WARNING: You won't be able to build archives until then (make dist is likely to fail). "
   echo "WARNING:"
 fi
+
 echo $build_id > stamp.configure
 
 exit 0;