Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
I don't know why this example wasn't working. I changed it in order to
[simgrid.git] / configure.ac
index 067424b..7c28d55 100644 (file)
@@ -16,6 +16,12 @@ AC_LANG([C])
 AM_INIT_AUTOMAKE(gnu)
 AC_CONFIG_MACRO_DIR(acmacro) 
 ACLOCAL="$ACLOCAL -I acmacro"
+
+dnl Next few lines is a hack to prevent libtool checking for F77
+m4_undefine([AC_PROG_F77])
+m4_defun([AC_PROG_F77],[])
+
+dnl We do build a proper DLL when using win32
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
@@ -173,21 +179,14 @@ dnl #  direction of stack grow
   AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext)
 fi
 
-
 #########################################
-## Build optional modules (simix)
+## Check for libraries extra-dependencies
 ##
-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.)
-fi
-AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
+
+SG_CONFIGURE_PART(Checking extra libraries dependencies...)
+
+SIMGRID_DEP=""
+GRAS_DEP=""
 
 #########################################
 ## Build optional modules (gtnets)
@@ -196,7 +195,7 @@ 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. $gtnets_path)
+  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_DEFINE(USE_GTNETS, 1, [Indicates whether we should use GTNetS or not])
@@ -206,18 +205,11 @@ else
   GTNETS_CFLAGS=-I$gtnets_path/include
   AC_SUBST([GTNETS_CFLAGS])  
   GTNETS_LDFLAGS=-L$gtnets_path/lib
-  AC_SUBST([GTNETS_LDFLAGS])  
+  AC_SUBST([GTNETS_LDFLAGS])
+  SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS -lgtnets"
 fi
 AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO)
 
-#########################################
-## Check for libraries extra-dependencies
-##
-
-SG_CONFIGURE_PART(Checking extra libraries dependencies...)
-
-SIMGRID_DEP=""
-GRAS_DEP=""
 if test xpthread=xyes ; then 
   # if the pthreads are usable
   if test "x$with_context" = "xpthread" ; then
@@ -404,23 +396,26 @@ AC_CONFIG_FILES([
 
 # Examples
 
+#      examples/gras/p2p/Makefile
+#      examples/gras/p2p/chord/Makefile
+#      examples/gras/p2p/can/Makefile
+
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
+      examples/msg/basic.tesh         examples/msg/small_plat.tesh 
+      examples/msg/suspend.tesh       examples/msg/flexml_bypass.tesh 
     examples/simdag/Makefile       examples/simdag/test_simdag
-    examples/gras/Makefile 
-      examples/gras/ping/Makefile   examples/gras/ping/test_sg   examples/gras/ping/test_rl
-      examples/gras/rpc/Makefile    examples/gras/rpc/test_sg    examples/gras/rpc/test_rl
-      examples/gras/timer/Makefile  examples/gras/timer/test_sg  examples/gras/timer/test_rl
-      examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
-      examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl
-      examples/gras/mmrpc/Makefile  examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl
-      examples/gras/pmm/Makefile    examples/gras/pmm/test_sg    examples/gras/pmm/test_rl
-      examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl
-
-      examples/gras/p2p/Makefile
-      examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl
-      examples/gras/p2p/can/Makefile   examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl
+    examples/gras/Makefile
+      examples/gras/ping/Makefile   
+      examples/gras/rpc/Makefile
+      examples/gras/timer/Makefile
+      examples/gras/chrono/Makefile
+      examples/gras/mutual_exclusion/simple_token/Makefile
+      examples/gras/mmrpc/Makefile
+      examples/gras/pmm/Makefile
+      examples/gras/all2all/Makefile
+
       
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
@@ -428,34 +423,15 @@ AC_CONFIG_FILES([
 ],[
     for file in                                                 \
      \
-     examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
-     examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
-     \
-     examples/gras/ping/test_sg   examples/gras/ping/test_rl    \
-     examples/gras/rpc/test_sg    examples/gras/rpc/test_rl     \
-     examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
-     examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
-     examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl  \
-     examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl   \
-     examples/gras/pmm/test_sg    examples/gras/pmm/test_rl     \
-     examples/gras/all2all/test_sg  examples/gras/all2all/test_rl   \
-     examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl  \
-     examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl  \
      examples/msg/run_msg_test                                  \
      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                                                        \
       test -e $file && chmod +x $file;                          \
     done
 ])
 
-#     examples/gras/chord/test_sg  examples/gras/chord/test_rl   \
-#    examples/gras/pastry/test_sg   
-
-
-
-#    examples/gras/saturate/Makefile  examples/gras/saturate/test_sg
-#    examples/gras/alnem/Makefile     examples/gras/alnem/test_sg
-
 
 # GRAMINE_CUT_END