AC_REVISION($Revision$)
AC_CANONICAL_TARGET
AC_LANG([C])
+AC_PROG_CXX
AM_PROG_GCJ
AM_INIT_AUTOMAKE([gnu -Wno-portability])
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
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.)
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)
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)
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;
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]),
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
## 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)
Makefile
include/Makefile
src/Makefile
- src/context_sysv_stack.h
+ src/context_sysv_config.h
])
# Tools being embeeded in gramine (stub generator)
tools/gras/Makefile
tools/tesh/Makefile
])
+# tools/tesh2/Makefile
# GRAMINE_CUT_BEGIN
],[
for file in \
tools/graspe-slave tools/graspe-master \
+ checkall examples/java/runtest \
; do \
test -e $file && chmod +x $file; \
done