ignore cruft

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 16ccabc..6ace0d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,8 @@ else
       AC_ERROR([no appropriate backend found])
     fi
 fi
+AM_CONDITIONAL(IS_WINDOWS,test x$windows_context = xyes)
+
 
 dnl #
 dnl #  3. allow decision to be overridden by user
@@ -160,9 +162,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 +190,7 @@ fi
 SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 
 SIMGRID_DEP=""
+SMPI_DEP=""
 GRAS_DEP=""
 
 if test xpthread=xyes ; then 
@@ -279,6 +282,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"])
@@ -289,7 +293,9 @@ case $host_os in
             AM_CPPFLAGS="$AM_CPPFLAGS -DDLL_EXPORT"
             AC_DEFINE(CONTEXT_THREADS,1);;
 esac
-          
+
+
+
 if test "x$GRAS_DEP" = x; then 
    AC_MSG_RESULT(none)
 else
@@ -454,16 +460,19 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([  
   testsuite/Makefile
   testsuite/run_tests    
-  testsuite/gras/trp_tcp_usage  testsuite/gras/trp_file_usage
 ],[
     for file in                                                 \
      testsuite/run_tests                                        \
-     testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
 ])
 
+# Teshsuite (testsuite using tesh)
+AC_CONFIG_FILES([  
+  teshsuite/Makefile
+])
+
 # Documentation
 AC_CONFIG_FILES([
   doc/Makefile
@@ -489,7 +498,7 @@ fi
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
-    examples/simdag/Makefile       examples/simdag/test_simdag
+    examples/simdag/Makefile
     examples/gras/Makefile
       examples/gras/ping/Makefile   
       examples/gras/rpc/Makefile
@@ -507,7 +516,6 @@ AC_CONFIG_FILES([
 ],[
     for file in                                                 \
      \
-     examples/simdag/test_simdag                               \
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
      examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
     ; do                                                        \
@@ -515,6 +523,10 @@ AC_CONFIG_FILES([
     done
 ])
 
+AC_CONFIG_FILES([
+  src/smpi/smpicc
+  src/smpi/smpirun
+])
 
 # GRAMINE_CUT_END