sync generated files

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ce13b52..9241aef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.1.1-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.2-cvs],[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
@@ -44,17 +44,14 @@ AC_CHECK_FUNCS([gettimeofday usleep \
                 sysconf\
                 readv\
                popen\
-               signal])
+               signal\
+               getline])
                 
 # 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))
-# we don't use those:
-# A C_CHECK_FUNC( asnprintf, :,   A C_DEFINE(NEED_ASNPRINTF,  1, enable the asnprintf  replacement))
-# A C_CHECK_FUNC(vasnprintf, :,   A C_DEFINE(NEED_VASNPRINTF, 1, enable the vansprintf replacement))
-
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -134,7 +131,7 @@ 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])
   else
     if test ".$windows_context" = .yes ; then
       AC_MSG_RESULT(use windows context portability layer.)
@@ -149,8 +146,8 @@ 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, no way (try --with-context=ucontext if you haven't already tried).]])])
-  AC_DEFINE([USE_PTHREADS],1,[Define if we use pthreads or not])
+    [AC_MSG_ERROR([[Cannot find pthreads (try --with-context=ucontext if you haven't already tried).]])])
+  AC_DEFINE([CONTEXT_THREADS],1,[Define if xbt contexts are based on our threads implementation or not])
   AC_MSG_RESULT(You have pthreads. Let's use them.)
 fi
 
@@ -176,16 +173,16 @@ fi
 ## Build optional modules (simix)
 ##
 SG_CONFIGURE_PART(Optional modules)
-AC_ARG_ENABLE(use-simix,
+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 willl come to SimIX: x$enable_simix)
+  AC_MSG_RESULT(Eventually you will come to SimIX: x$enable_simix)
 fi
-AM_CONDITIONAL(USE_SIMIX,test x$csdp != xno)
+AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
 
 #########################################
 ## Check for libraries extra-dependencies
@@ -193,8 +190,11 @@ AM_CONDITIONAL(USE_SIMIX,test x$csdp != xno)
 
 SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 
-AC_MSG_CHECKING(for csdp)
 SIMGRID_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 
@@ -208,13 +208,14 @@ AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno)
 
 AC_SUBST([SIMGRID_DEP])
 
-GRAS_DEP=""
 AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"])
 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" ;;
+  *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32";
+            AC_SUBST(AM_CFLAGS,-DDLL_EXPORT)
+            AC_DEFINE(CONTEXT_THREADS,1);;
 esac
           
 if test "x$GRAS_DEP" = x; then 
@@ -330,6 +331,8 @@ AC_CONFIG_FILES([
   tools/Makefile
     tools/gras/Makefile
 ])
+dnl tools/tesh/Makefile
+
 
 # GRAMINE_CUT_BEGIN