X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d025d7c1cb392baeaaed4b058f0ec82b9cb11fde..e3b3d1c9edfeb6e69cbd0b3042b35d24b6795e41:/configure.ac diff --git a/configure.ac b/configure.ac index a398013903..ca8d990af7 100644 --- 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 ############### @@ -36,12 +37,14 @@ AC_CHECK_HEADERS([sys/socket.h \ windows.h winsock.h winsock2.h \ sys/time.h \ errno.h unistd.h \ - execinfo.h]) + execinfo.h\ + signal.h ]) AC_CHECK_FUNCS([gettimeofday usleep \ getdtablesize \ sysconf\ readv\ - popen]) + popen\ + signal]) # check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/) AC_FUNC_SNPRINTF @@ -195,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 @@ -220,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 @@ -247,6 +261,18 @@ if test x$ADDR2LINE != x ; then AC_DEFINE_UNQUOTED(ADDR2LINE,"$ADDR2LINE",[Path to the addr2line tool]) fi +AC_SUBST(ac_configure_args) +# Can we make status line about the compilation result? +AC_CHECK_PROG(MD5SUM,md5sum,`which md5sum`) +if test x$MD5SUM != xno ; then + build_version=`find -name '*.[ch]' |grep -v src/ucontext_stack.h | grep -v src/gras_config.h |\ + xargs cat| $MD5SUM | sed 's/ .*$//'` +else + build_version="no_md5sum_binary" +fi +build_id="$PACKAGE ver=$VERSION build=$build_version args=\"$ac_configure_args\"" +AC_SUBST(build_id) + ################### ## Makes the output ## @@ -257,20 +283,68 @@ 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 +]) + +# Tools being embeeded in gramine (stub generator) +AC_CONFIG_FILES([ + tools/Makefile + tools/gras/Makefile +]) + +# GRAMINE_CUT_BEGIN + +# Tools NOT being embeeded in gramine +AC_CONFIG_FILES([ + tools/graspe-slave +],[ + for file in \ + tools/graspe-slave tools/graspe-master \ + ; do \ + test -e $file && chmod +x $file; \ + done +]) + +# 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 +]) + +# Documentation +AC_CONFIG_FILES([ + doc/Makefile + doc/Doxyfile +]) + +# Examples + +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 @@ -282,18 +356,8 @@ AC_CONFIG_FILES([ examples/amok/Makefile examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl examples/amok/saturate/Makefile examples/amok/saturate/test_sg examples/amok/saturate/test_rl - doc/Makefile - 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 \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ @@ -302,19 +366,19 @@ 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 ]) - # examples/gras/chord/test_sg examples/gras/chord/test_rl \ # examples/gras/pastry/test_sg @@ -324,6 +388,7 @@ AC_CONFIG_FILES([ # examples/gras/alnem/Makefile examples/gras/alnem/test_sg +# GRAMINE_CUT_END AC_OUTPUT @@ -334,6 +399,7 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( Compiler: ${CC} (version: ${GCC_VERSION}) CFlags: ${CFLAGS} + CPPFlags: ${CPPFLAGS} LDFlags: ${LDFLAGS} Context backend: ${with_context} @@ -347,5 +413,6 @@ if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then echo "WARNING: ./configure --enable-maintainer-mode $ac_configure_args" echo "WARNING:" fi +echo $build_id > stamp.configure exit 0;