Take into account the case where some variable do not consume anything.

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 16ccabc..08fab5d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -160,9 +160,9 @@ if test "x$with_context" = "xpthread"; then
   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" = xpthread)
+AM_CONDITIONAL(CONTEXT_THREADS,test "x$with_context" != xucontext)
 
 dnl #
 dnl #  4. determine a few additional details
@@ -188,6 +188,7 @@ fi
 SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 
 SIMGRID_DEP=""
+SMPI_DEP=""
 GRAS_DEP=""
 
 if test xpthread=xyes ; then 
@@ -279,6 +280,7 @@ fi
 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"])
@@ -515,6 +517,10 @@ AC_CONFIG_FILES([
     done
 ])
 
+AC_CONFIG_FILES([
+  src/smpi/smpicc
+  src/smpi/smpirun
+])
 
 # GRAMINE_CUT_END