Simix Initial structure

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ca8d990..2bbc946 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -83,10 +83,7 @@ dnl #  1. determine possibilities
 dnl #
 
 dnl #  check for MCSC method
-AC_MSG_CHECKING(on top of what can we build the contexts)
-AC_CHECK_HEADER(ucontext.h,,, [#include <sys/types.h>])
-AC_CHECK_FUNCS(makecontext swapcontext getcontext setcontext)
-AC_CHECK_MCSC(mcsc=yes, mcsc=no)
+AC_CHECK_MCSC(mcsc=yes, mcsc=no) 
 
 dnl #  check for pthread method
 AC_CHECK_HEADERS([pthread.h])
@@ -121,12 +118,17 @@ AC_ARG_WITH(pthread, [  --with-pthread   Use pthread instead of ucontext.],with_
 AC_ARG_WITH(context,
   [  --with-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=auto]].],,
   with_context=auto)
+
+if test "x$with_context$mcsc" = "xucontextno" ; then 
+  AC_MSG_ERROR([--with-context=ucontext specified but ucontext unusable. Relaunch configure without this argument.], 77)
+fi
+
 case $with_context in
  ucontext) ;;
  pthread) ;;
  windows) ;;
  auto) with_context=ucontext;;
- *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;;
+ *) AC_MSG_ERROR([--with-context must be either ucontext or pthread]) ;;
 esac
 
 if test "x$with_context" = "xucontext" ; then
@@ -169,12 +171,41 @@ dnl #  direction of stack grow
   AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext)
 fi
 
+
+#########################################
+## Build optional modules (simix)
+##
+SG_CONFIGURE_PART(Optional modules)
+AC_ARG_ENABLE(simix,
+  AS_HELP_STRING([--enable-simix], [Use the new SimIX module (default=no)]),
+  enable_simix=$enableval,enable_simix=no)
+if test "x$enable_simix" = "xyes" ; then
+  AC_MSG_RESULT("***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****")
+  AC_DEFINE(USE_SIMIX, 1, [Indicates whether we should use SimIX or not])
+else 
+  AC_MSG_RESULT(Eventually you will come to SimIX: x$enable_simix)
+fi
+AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
+
 #########################################
 ## Check for libraries extra-dependencies
 ##
 
 SG_CONFIGURE_PART(Checking extra libraries dependencies...)
+
+AC_MSG_CHECKING(for csdp)
 SIMGRID_DEP=""
+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)
+
 AC_SUBST([SIMGRID_DEP])
 
 GRAS_DEP=""
@@ -193,6 +224,7 @@ else
 fi
 AC_SUBST([GRAS_DEP])
 
+
 ##############################################
 ## Enhance maintainer mode and SUBST variables
 ## (must be placed after any compilation tests since our overprotective flags
@@ -408,7 +440,7 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
 if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then
   echo "WARNING:"
   echo "WARNING: you seem to compile the CVS version without the maintainer mode."
-  echo "WARNING: This is not really supported, so you should configure SimGrid like:"
+  echo "WARNING: You may want to enable this by specifying:"
   echo "WARNING:"
   echo "WARNING: ./configure --enable-maintainer-mode  $ac_configure_args"
   echo "WARNING:"