No need for *.l in gramine

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9dd4533..14c91b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.1-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.1.1-cvs],[simgrid-devel@lists.gforge.inria.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 # A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
@@ -16,6 +16,7 @@ AC_LANG([C])
 AM_INIT_AUTOMAKE(gnu)
 AC_CONFIG_MACRO_DIR(acmacro) 
 ACLOCAL="$ACLOCAL -I acmacro"
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
 ###############
@@ -197,6 +198,16 @@ AC_SUBST([GRAS_DEP])
 ## (must be placed after any compilation tests since our overprotective flags
 ##  let some tests fail)
 
+# Check whether we are doing a regular build or a GRAMINE (minimal) one
+# Next line is modified by sed when building gramine source tree
+gramine_mode=no
+if test x$gramine_mode = xyes
+then
+  USE_MAINTAINER_MODE=no
+fi
+AM_CONDITIONAL(GRAMINE_MODE,test x$gramine_mode != xno)
+
+
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
@@ -222,6 +233,7 @@ AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
 
+
 # Can we rebuild the parsers?
 # We really want flex and refuse other lex. So, the parser is portable and
 # does not induce extra lib dependency
@@ -259,20 +271,45 @@ fi
 #  src/amok/Makefile
 
 SG_CONFIGURE_PART(Generating files...)
+
+# Core of the libraries
+
 AC_CONFIG_FILES([
   Makefile
   include/Makefile
   src/Makefile
   src/ucontext_stack.h
+])
+
+# GRAMINE_CUT_BEGIN
+
+# Testsuite
+
+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
+])
+
+# Examples, documentation and tools
+
+AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile           examples/msg/run_msg_test
-    examples/simdag/Makefile
+    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/tokenS/Makefile examples/gras/tokenS/test_sg examples/gras/tokenS/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
@@ -288,13 +325,8 @@ AC_CONFIG_FILES([
     doc/Doxyfile
   tools/graspe-slave            tools/Makefile
     tools/gras/Makefile
-  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 \
      tools/graspe-slave           tools/graspe-master           \
      \
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
@@ -304,13 +336,14 @@ AC_CONFIG_FILES([
      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/tokenS/test_sg examples/gras/tokenS/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                               \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
@@ -326,6 +359,7 @@ AC_CONFIG_FILES([
 #    examples/gras/alnem/Makefile     examples/gras/alnem/test_sg
 
 
+# GRAMINE_CUT_END
 
 AC_OUTPUT