X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/849fa6c25089bdc4a465ab7de30d487ad75fdc05..7725d3bbfb046caa2e0eafc8150ee68aac38ee10:/configure.ac

diff --git a/configure.ac b/configure.ac
index 1f8e726b50..c6fe50bfcb 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-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.3-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
@@ -31,6 +31,15 @@ dnl We do build a proper DLL when using win32
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
+###############
+## SVN version check
+##
+if test -e .svn ; then
+  VERSION="$VERSION-r`svnversion`"
+  PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
+  PACKAGE_STRING="PACKAGE_STRING r`svnversion`"  
+fi
+
 ###############
 ## System checks
 ##
@@ -99,13 +108,38 @@ 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 the sem_timedwait is avaible or not (part of XPG6 standard only)])
+        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)
@@ -165,6 +199,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.)
@@ -177,8 +212,7 @@ if test "x$with_context" = "xucontext" ; then
 fi
 
 if test "x$with_context" = "xpthread"; then
-  AC_CHECK_HEADERS([pthread.h])
-  if test x$pthread != xyes ; then
+  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])
@@ -249,17 +283,18 @@ else
   CPPFLAGS=$CPPFLAGS_SAV
   LDFLAGS=$LDFLAGS_SAV
   AC_LANG_POP([C++])  
+fi
 
-  if test "x$gtnets" = xyes ; then 
-    AM_CPPFLAGS="$AM_CPPFLAGS $GTNETS_CPPFLAGS"
-    SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS"
-    AC_MSG_RESULT(Found working gtnets library.)
-    AC_DEFINE(HAVE_GTNETS, 1, [Indicates whether we have the GTNETS library or not])
-  else
-    AC_MSG_RESULT(Could not find any working gtnets library or not patched version, see config.log for details .)
-  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)
+AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno")
+
+
+
 
 #########################################
 ## Build optional modules (csdp)
@@ -268,8 +303,9 @@ csdp=no
 AC_ARG_WITH(csdp,
   AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, i.e. not using csdp)]),
   csdp_path="$withval",csdp_path="no")
+  AC_MSG_CHECKING(for CSDP option:)
 if test "x$csdp_path" = "xno" ; then
-  AC_MSG_RESULT(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)
@@ -294,7 +330,7 @@ else
     AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS"
     SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS"
     AC_MSG_RESULT(Found working sdp library.)
-    AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not])
+    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;
@@ -379,7 +415,6 @@ SG_CONFIGURE_PART(Check for Java bindings...)
 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)
-AC_MSG_CHECKING(whether to compile java bindings)
 if test "x$disable_java" != "xyes" ; then
    use_java="disabled by user"
 else
@@ -393,13 +428,15 @@ else
      && 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($use_java)
+AC_MSG_RESULT(decide whether to compile java bindings... $use_java)
 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
+
 #####################
 ## Check for programs
 ##
@@ -438,15 +475,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)
 
 ###################
@@ -466,7 +498,7 @@ AC_CONFIG_FILES([
   Makefile
   include/Makefile
   src/Makefile
-  src/ucontext_stack.h
+  src/context_sysv_config.h
 ])
 
 # Tools being embeeded in gramine (stub generator)
@@ -485,6 +517,7 @@ AC_CONFIG_FILES([
 ],[
     for file in                                                 \
      tools/graspe-slave           tools/graspe-master           \
+     checkall                     examples/java/runtest         \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
@@ -538,6 +571,7 @@ AC_CONFIG_FILES([
       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