I don't know why this example wasn't working. I changed it in order to

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b66c77d..7c28d55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)
@@ -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
@@ -433,6 +425,8 @@ AC_CONFIG_FILES([
      \
      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