A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No need for *.l in gramine
[simgrid.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
9a5e6fa
..
14c91b4
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-4,7
+4,7
@@
##
AC_PREREQ(2.59)
##
AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.
0.2
-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
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"
AM_INIT_AUTOMAKE(gnu)
AC_CONFIG_MACRO_DIR(acmacro)
ACLOCAL="$ACLOCAL -I acmacro"
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
###############
AC_PROG_LIBTOOL
###############
@@
-36,11
+37,14
@@
AC_CHECK_HEADERS([sys/socket.h \
windows.h winsock.h winsock2.h \
sys/time.h \
errno.h unistd.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\
AC_CHECK_FUNCS([gettimeofday usleep \
getdtablesize \
sysconf\
- readv])
+ readv\
+ popen\
+ signal])
# check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
AC_FUNC_SNPRINTF
# check for a working snprintf (or use xbt/snprintf.c, which comes from http://www.ijs.si/software/snprintf/)
AC_FUNC_SNPRINTF
@@
-111,6
+115,9
@@
dnl # 3. allow decision to be overridden by user
dnl #
AC_MSG_CHECKING(what kind of backend should we use)
dnl #
AC_MSG_CHECKING(what kind of backend should we use)
+
+AC_ARG_WITH(pthread, [ --with-pthread Use pthread instead of ucontext.],with_context=pthread)
+
AC_ARG_WITH(context,
[ --with-context=[ucontext/pthread] Use either (System V) swapcontext or pthread [[default=auto]].],,
with_context=auto)
AC_ARG_WITH(context,
[ --with-context=[ucontext/pthread] Use either (System V) swapcontext or pthread [[default=auto]].],,
with_context=auto)
@@
-191,6
+198,16
@@
AC_SUBST([GRAS_DEP])
## (must be placed after any compilation tests since our overprotective flags
## let some tests fail)
## (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
AM_MAINTAINER_MODE
if test x$USE_MAINTAINER_MODE = xyes
then
@@
-202,6
+219,10
@@
SG_COMPILE_FLAGS
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
+AC_SUBST([abs_builddir])
+AC_SUBST([abs_srcdir])
+AC_SUBST([abs_top_builddir])
+AC_SUBST([abs_top_srcdir])
#####################
## Check for programs
#####################
## Check for programs
@@
-212,6
+233,7
@@
AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
WARNING="This file is generated, do not edit"
AC_SUBST(WARNING)
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
# 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
@@
-233,6
+255,12
@@
then
fi
fi
fi
fi
+# Can we extract really usable backtraces? (also need the popen function)
+AC_PATH_PROG(ADDR2LINE, addr2line)
+if test x$ADDR2LINE != x ; then
+ AC_DEFINE_UNQUOTED(ADDR2LINE,"$ADDR2LINE",[Path to the addr2line tool])
+fi
+
###################
## Makes the output
##
###################
## Makes the output
##
@@
-243,49
+271,79
@@
fi
# src/amok/Makefile
SG_CONFIGURE_PART(Generating files...)
# src/amok/Makefile
SG_CONFIGURE_PART(Generating files...)
+
+# Core of the libraries
+
AC_CONFIG_FILES([
Makefile
include/Makefile
src/Makefile
src/ucontext_stack.h
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/Makefile
examples/msg/Makefile examples/msg/run_msg_test
+ examples/simdag/Makefile examples/simdag/test_simdag
examples/gras/Makefile
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/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/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/mmrpc/Makefile examples/gras/mmrpc/test_sg examples/gras/mmrpc/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/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/amok/Makefile
examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
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
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 \
],[
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 \
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 \
\
examples/gras/ping/test_sg examples/gras/ping/test_rl \
\
examples/gras/ping/test_sg examples/gras/ping/test_rl \
- examples/gras/rpc/test_sg examples/gras/rpc/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/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/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/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/msg/run_msg_test \
+ examples/simdag/test_simdag \
; do \
test -e $file && chmod +x $file; \
done
; do \
test -e $file && chmod +x $file; \
done
@@
-301,6
+359,7
@@
AC_CONFIG_FILES([
# examples/gras/alnem/Makefile examples/gras/alnem/test_sg
# examples/gras/alnem/Makefile examples/gras/alnem/test_sg
+# GRAMINE_CUT_END
AC_OUTPUT
AC_OUTPUT
@@
-311,9
+370,19
@@
Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
Compiler: ${CC} (version: ${GCC_VERSION})
CFlags: ${CFLAGS}
Compiler: ${CC} (version: ${GCC_VERSION})
CFlags: ${CFLAGS}
+ CPPFlags: ${CPPFLAGS}
LDFlags: ${LDFLAGS}
Context backend: ${with_context}
"
LDFlags: ${LDFLAGS}
Context backend: ${with_context}
"
+if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then
+ echo "WARNING:"
+ echo "WARNING: you seem to compile the CVS version without the maintainer mode."
+ echo "WARNING: This is not really supported, so you should configure SimGrid like:"
+ echo "WARNING:"
+ echo "WARNING: ./configure --enable-maintainer-mode $ac_configure_args"
+ echo "WARNING:"
+fi
+
exit 0;
exit 0;