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
Do not test for datadesc.little64 since I have no host to regenerate the test file...
[simgrid.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
b2e4de5
..
1e1a5f9
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,20
+1,25
@@
-
AC_PREREQ(2.57
)
+
AC_PREREQ(2.59
)
#We need a recent ACI
ACI_PREREQ(2003.01.16)
#We need a recent ACI
ACI_PREREQ(2003.01.16)
-AC_INIT([GRAS],[0.0.040304],[martin.quinson@ens-lyon.fr])
+AC_INIT([GRAS],[0.0.4],[martin.quinson@ens-lyon.fr])
+
+
AC_CONFIG_SRCDIR([src/include/gras.h])
AC_CONFIG_SRCDIR([src/include/gras.h])
+# MACRO_DIR should tell aclocal to search for my macro. That's the autoconf
+# maintainer plan, but automake does not implement this yet (as in 1.8)
+AC_CONFIG_MACRO_DIR(acmacro)
+
AC_REVISION($Revision$)
AC_REVISION($Revision$)
-dnl A C_CONFIG_SUBDIRS(src/nws_portability)
AC_CANONICAL_TARGET
AC_LANG([C])
AC_CANONICAL_TARGET
AC_LANG([C])
-A
M_CONFIG_HEADER(src/gras_config.h
)
+A
C_CONFIG_HEADERS([src/gras_config.h]
)
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE
-A
M
_PROG_LIBTOOL
+A
C
_PROG_LIBTOOL
# declare the modules (no optional module)
# declare the modules (no optional module)
@@
-29,8
+34,10
@@
AC_PROG_CC
AM_SANITY_CHECK
AC_PROG_MAKE_SET
AM_SANITY_CHECK
AC_PROG_MAKE_SET
-# Check architecture signature
+# Check architecture signature
begin
GRAS_ARCH
GRAS_ARCH
+# Check architecture signature end
+GRAS_CHECK_STRUCT_COMPACTION
# Checks for header files.
AC_HEADER_STDC
# Checks for header files.
AC_HEADER_STDC
@@
-46,15
+53,24
@@
AC_FUNC_MALLOC
AC_FUNC_MEMCMP
AC_CHECK_FUNCS([memset strchr strerror usleep])
AC_FUNC_MEMCMP
AC_CHECK_FUNCS([memset strchr strerror usleep])
+# 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
+AC_PROG_LEX
+if test "$LEX" != flex; then
+ LEX="$SHELL $missing_dir/missing flex"
+fi
+
# Can we rebuild the documentation?
# Can we rebuild the documentation?
-G
NOME_GTKDOC_CHECK
+G
TK_DOC_CHECK()
dnl ####[ Search libs ]#######################################################
dnl ####[ Search libs ]#######################################################
-ACI_PACKAGE_SAVED(XML,[XML library (version XML2)],xml2-config,,,:)
ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
-dnl A C_CHECK_LIB(pthread, pthread_mutex_lock)
+dnl A C_CHECK_LIB(pthread, pthread_mutex_lock, LIBS="$LIBS -lpthread")
+AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
+AC_CHECK_LIB(socket, connect, [LIBS="$LIBS -lsocket"])
dnl ####[ maint mode ]#######################################################
AM_MAINTAINER_MODE
dnl ####[ maint mode ]#######################################################
AM_MAINTAINER_MODE
@@
-83,23
+99,28
@@
AC_CONFIG_FILES([
src/base/Tests/run_tests
src/base/Tests/trp_tcp_usage
src/base/Tests/trp_file_usage
src/base/Tests/run_tests
src/base/Tests/trp_tcp_usage
src/base/Tests/trp_file_usage
- src/modules/Makefile
src/examples/Makefile
src/examples/ping/Makefile
src/examples/Makefile
src/examples/ping/Makefile
- src/examples/bandwidth/Makefile src/examples/saturate/Makefile
- src/examples/alnem/Makefile
doc/Makefile
doc/Makefile
+ tools/compile-remote-worker
],[( cd src/include ; test -e gras || ln -s . gras )
test -e src/base/Tests/trp_tcp_usage && chmod +x src/base/Tests/trp_tcp_usage;
test -e src/base/Tests/trp_file_usage && chmod +x src/base/Tests/trp_file_usage;
test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests;
],[( cd src/include ; test -e gras || ln -s . gras )
test -e src/base/Tests/trp_tcp_usage && chmod +x src/base/Tests/trp_tcp_usage;
test -e src/base/Tests/trp_file_usage && chmod +x src/base/Tests/trp_file_usage;
test -e src/base/Tests/run_tests && chmod +x src/base/Tests/run_tests;
+ test -e tools/compile-remote-worker && chmod +x tools/compile-remote-worker;
+ chmod +x tools/gras-check-arch;
chmod +x src/examples/ping/test_rl; chmod +x src/examples/ping/test_sg])
chmod +x src/examples/ping/test_rl; chmod +x src/examples/ping/test_sg])
+# src/examples/pastry/Makefile
+# src/modules/Makefile
+# src/examples/bandwidth/Makefile src/examples/saturate/Makefile
+# src/examples/alnem/Makefile
+
AC_OUTPUT
echo "
AC_OUTPUT
echo "
-Configuration of package \`${PACKAGE}':
+Configuration of package \`${PACKAGE}'
on $gras_arch_name (=$gras_arch)
:
Compiler: ${CC}
Compiler: ${CC}