X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f885aa29e590cb747421ebfe897310e7e99c8658..1b999f4d2d76ade77e528fbacaaa1ee78606fb2a:/configure.ac

diff --git a/configure.ac b/configure.ac
index e99f0a14d2..31f5429475 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl GNU LGPL (v2.1) licence.
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.3-svn],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.4-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
@@ -17,6 +17,7 @@ AC_CONFIG_HEADERS([src/gras_config.h])
 AC_REVISION($Revision$)
 AC_CANONICAL_TARGET
 AC_LANG([C])
+AC_PROG_CXX
 AM_PROG_GCJ
 
 AM_INIT_AUTOMAKE([gnu -Wno-portability])
@@ -94,7 +95,7 @@ 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
@@ -199,6 +200,7 @@ if test "x$with_context" = "xucontext" ; then
   if test ".$mcsc" = .yes; then
     AC_MSG_RESULT(found working ucontext. Great!)
     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.)
@@ -304,7 +306,7 @@ AC_ARG_WITH(csdp,
   csdp_path="$withval",csdp_path="no")
   AC_MSG_CHECKING(for CSDP option:)
 if test "x$csdp_path" = "xno" ; then
-  AC_MSG_RESULT(no, eventually you will come to csdp.)
+  AC_MSG_RESULT([no, eventually you will come to csdp.])
 else  
   AC_MSG_RESULT(***** You have decided to use csdp. Let's check whether it works or not *****)
   AC_MSG_CHECKING(for csdp)
@@ -409,7 +411,7 @@ if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes
 fi
 
 
-SG_CONFIGURE_PART(Check for Java bindings...)
+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]),
@@ -421,11 +423,7 @@ else
   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
-   
+  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   
@@ -440,7 +438,7 @@ 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)
@@ -506,6 +504,7 @@ AC_CONFIG_FILES([
     tools/gras/Makefile
     tools/tesh/Makefile
 ])
+#    tools/tesh2/Makefile
 
 
 # GRAMINE_CUT_BEGIN