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.)
else
AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****)
AC_MSG_CHECKING(for gtnets)
- AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support])
- AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno")
AC_LANG_PUSH([C++])
GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib"
GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
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 -DHAVE_GTNETS"
+ CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
fi
-
+AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno")
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)
csdp=no;
fi
if test "x$csdp" = xyes; then
- AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS -DHAVE_SDP"
+ 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])
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)
tools/gras/Makefile
tools/tesh/Makefile
])
+# tools/tesh2/Makefile
# GRAMINE_CUT_BEGIN