A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added xbt_os_time and xbt_os_sleep. Execute in the real and simulate systems.
[simgrid.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
fd96814
..
f846d66
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-217,8
+217,10
@@
if test xpthread=xyes ; then
# if we use them to implement the xbt_context
SIMGRID_DEP="-lpthread"
fi
# 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)
- GRAS_DEP="-lpthread"
+ # 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_MSG_CHECKING(for csdp)
fi
AC_MSG_CHECKING(for csdp)
@@
-295,14
+297,14
@@
AC_MSG_CHECKING(whether to compile java bindings)
if test -n "$JAVAC" \
&& test -n "$JAVA" \
&& test -n "$JAR" \
if test -n "$JAVAC" \
&& test -n "$JAVA" \
&& test -n "$JAR" \
- && test "x$ac_cv_header_jni_h"
=
"xyes" ; then
+ && test "x$ac_cv_header_jni_h"
=
"xyes" ; then
use_java="yes"
else
use_java="no"
fi
AC_MSG_RESULT($use_java)
use_java="yes"
else
use_java="no"
fi
AC_MSG_RESULT($use_java)
-AM_CONDITIONAL(HAVE_JAVA,test "x$use_java"
=
"xyes")
+AM_CONDITIONAL(HAVE_JAVA,test "x$use_java"
=
"xyes")
#####################
## Check for programs
#####################
## Check for programs
@@
-431,6
+433,8
@@
AC_CONFIG_FILES([
examples/gras/Makefile
examples/gras/ping/Makefile
examples/gras/rpc/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/chrono/Makefile
examples/gras/mutual_exclusion/simple_token/Makefile
examples/gras/timer/Makefile
examples/gras/chrono/Makefile
examples/gras/mutual_exclusion/simple_token/Makefile