##
AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.3-svn],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.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
-AC_REVISION($Revision$)
+AC_REVISION($Revision: 6267 $)
AC_CANONICAL_TARGET
AC_LANG([C])
+AC_PROG_CXX
AM_PROG_GCJ
AM_INIT_AUTOMAKE([gnu -Wno-portability])
###############
## SVN version check
##
-if test -e .svn ; then
+if test -e .svn && cat $VERSION | grep -q svn; then
VERSION="$VERSION-r`svnversion`"
PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
PACKAGE_STRING="PACKAGE_STRING r`svnversion`"
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.)
GRAS_DEP="-lpthread"
fi
fi
+AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris
#########################################
## Build optional modules (gtnets)
-
-#########################################
-## Build optional modules (csdp)
-##
-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(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_LDFLAGS="-L$csdp_path/lib -lsdp -llapack -lblas -lm"
- CSDP_CPPFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp"
-
- AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,$CSDP_LDFLAGS)
-
- CPPFLAGS_SAV=$CPPFLAGS
- CPPFLAGS+=$CSDP_CPPFLAGS
- AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no, [])
- CPPFLAGS=$CPPFLAGS_SAV
-
-
-
- if test "x$csdp_lib = xyes" -a "x$csdp_header = xyes" ; then
- csdp=yes;
- else
- csdp=no;
- fi
- if test "x$csdp" = xyes; then
- 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])
- else
- AC_MSG_RESULT(Could not find any working sdp library.)
- fi;
-fi
-AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno)
-
AC_SUBST([SIMGRID_DEP])
AC_SUBST([SMPI_DEP])
if test x$USE_MAINTAINER_MODE = xyes
then
# Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt]
- enable_compile_warnings=yes
+ force_compile_warnings=yes
fi
SG_COMPILE_FLAGS
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)
AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND)
AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
-if test x$USE_MAINTAINER_MODE = xyes
-then
- # Check for doxygen when in maintainer mode since dist* targets fail
- # without it
- AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
- if test x$DOXYGEN = x ; then
- AC_MSG_ERROR([doxygen is mandatory in maintainer mode])
- fi
-fi
+# Check for doxygen when in maintainer mode which is helpful to build doc & dist
+AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
+AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x)
# Can we extract really usable backtraces? (also need the popen function)
AC_PATH_PROG(ADDR2LINE, addr2line)
tools/gras/Makefile
tools/tesh/Makefile
])
+# tools/tesh2/Makefile
# GRAMINE_CUT_BEGIN
examples/gras/pmm/Makefile
examples/gras/all2all/Makefile
examples/amok/Makefile
+ examples/smpi/Makefile
])
AC_CONFIG_FILES([
src/smpi/smpicc
src/smpi/smpirun
+],[
+ for file in \
+ src/smpi/smpicc \
+ src/smpi/smpirun \
+ ; do \
+ test -e $file && chmod +x $file; \
+ done
])
# GRAMINE_CUT_END
