AC_CHECK_LIB(pthread,pthread_create,,
[AC_MSG_ERROR([[Cannot find pthreads (try --with-context=ucontext if you haven't already tried).]])])
AC_DEFINE([CONTEXT_THREADS],1,[Define if xbt contexts are based on our threads implementation or not])
- AC_MSG_RESULT(You have pthreads. Let's use them.)
+ AC_MSG_RESULT(You have pthreads and requested for them. Fine.)
fi
+AM_CONDITIONAL(CONTEXT_THREADS,test "x$with_context" != xucontext)
dnl #
dnl # 4. determine a few additional details
SG_CONFIGURE_PART(Checking extra libraries dependencies...)
SIMGRID_DEP=""
+SMPI_DEP=""
GRAS_DEP=""
if test xpthread=xyes ; then
fi
fi
-
#########################################
## Build optional modules (gtnets)
##
if test "x$gtnets_path" = "xno" ; then
AC_MSG_RESULT(Eventually you will come to GTNetS.)
else
- AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****)
+ 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_CHECK_LIB(gtnets,Simulator.RunUntilNextCompletion,gtnets=yes, gtnets=no,-L$gtnets_path/lib)
- AX_CXX_CHECK_LIB(gtnets,[Simulator::RunUntilNextCompletion],gtnets=yes, gtnets=no,-L$gtnets_path/lib)
+ AC_LANG_PUSH([C++])
+ GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib"
+ GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
+ LDFLAGS_SAV=$LDFLAGS
+ CPPFLAGS_SAV=$CPPFLAGS
+ CPPFLAGS+=$GTNETS_CPPFLAGS
+ LDFLAGS+=$GTNETS_LDFLAGS
+ AC_TRY_LINK([ #include <simulator.h>
+ ], [Simulator s; s.RunUntilNextCompletion();], gtnets=yes, gtnets=no)
+ CPPFLAGS=$CPPFLAGS_SAV
+ LDFLAGS=$LDFLAGS_SAV
+ AC_LANG_POP([C++])
if test "x$gtnets" = xyes ; then
- GTNETS_CFLAGS=-I$gtnets_path/include
- AC_SUBST([GTNETS_CFLAGS])
- GTNETS_LDFLAGS=-L$gtnets_path/lib
- AC_SUBST([GTNETS_LDFLAGS])
+ 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.)
+ AC_MSG_RESULT(Could not find any working gtnets library or not patched version, see config.log for details .)
fi
fi
AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno)
##
csdp=no
AC_ARG_WITH(csdp,
- AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, ie not using csdp)]),
+ AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, i.e. not using csdp)]),
csdp_path="$withval",csdp_path="no")
if test "x$csdp_path" = "xno" ; then
AC_MSG_RESULT(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_RESULT(***** You have decided to use csdp. Let's check whether it works or not *****)
AC_MSG_CHECKING(for csdp)
- AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,-L$csdp_path/lib -llapack -lblas -lm)
- AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no,-I$csdp_path/include -I$csdp_path/include/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;
csdp=no;
fi
if test "x$csdp" = xyes; then
- CSDP_CFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp"
- AC_SUBST([CSDP_CFLAGS])
- CSDP_LDFLAGS="-L$csdp_path/lib"
- AC_SUBST([CSDP_LDFLAGS])
- SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS -lsdp -llapack -lblas -lm"
+ 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
AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno)
AC_SUBST([SIMGRID_DEP])
+AC_SUBST([SMPI_DEP])
AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"])
AC_CHECK_LIB(socket, connect, [GRAS_DEP="$GRAS_DEP -lsocket"])
AC_MSG_CHECKING(for extra dependencies of libgras)
case $host_os in
*mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32";
- AC_SUBST(AM_CFLAGS,-DDLL_EXPORT)
+ AM_CPPFLAGS="$AM_CPPFLAGS -DDLL_EXPORT"
AC_DEFINE(CONTEXT_THREADS,1);;
esac
fi
SG_COMPILE_FLAGS
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
+AC_SUBST([CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([LDFLAGS])
+AC_SUBST([AM_CPPFLAGS])
AC_SUBST([abs_builddir])
AC_SUBST([abs_srcdir])
AC_SUBST([abs_top_builddir])
