-AC_CHECK_LIB(pthread,pthread_create,SIMGRID_DEP="-lpthread"; GRAS_DEP="-lpthread")
-
-AC_MSG_CHECKING(for csdp)
-sdp=no
-AC_CHECK_LIB(sdp,sdp,csdp=yes, csdp=no,-llapack -lblas -lm)
-if test "x$csdp" = xyes; then
- SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm"
- 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;
-AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno)
+
+if test xpthread=xyes ; then
+ # if the pthreads are usable
+ if test "x$with_context" = "xpthread" ; then
+ # 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), but on windows (of course)
+ if test "x$with_context" != "xwindows" ; then
+ GRAS_DEP="-lpthread"
+ fi
+fi
+AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris
+
+#########################################
+## Build optional modules (gtnets)
+##
+gtnets=no
+AC_ARG_WITH(gtnets,
+ AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]),
+ gtnets_path="$withval",gtnets_path="no")
+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_CHECKING(for gtnets)
+ 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++])
+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")
+
+