From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 13 Jul 2004 01:39:17 +0000 (+0000)
Subject: Version 0.0.4; eradicate deprecated autoconf macros; test for lex (the datadesc parse... 
X-Git-Tag: v3.3~5087
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c2a0a99018ac40ded40ddd7b5a4049ad1658e36d

Version 0.0.4; eradicate deprecated autoconf macros; test for lex (the datadesc parser is there); support for remote compilation


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@259 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/configure.ac b/configure.ac
index d6af0b764e..1e1a5f9ef4 100644
--- 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)
 
-AC_INIT([GRAS],[0.0.2],[martin.quinson@ens-lyon.fr])
+AC_INIT([GRAS],[0.0.4],[martin.quinson@ens-lyon.fr])
+
+
 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$)
-dnl A C_CONFIG_SUBDIRS(src/nws_portability)
 
 AC_CANONICAL_TARGET
 AC_LANG([C])
 
-AM_CONFIG_HEADER(src/gras_config.h)
+AC_CONFIG_HEADERS([src/gras_config.h])
 AM_INIT_AUTOMAKE
 
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 # declare the modules (no optional module)
 
@@ -32,6 +37,7 @@ AC_PROG_MAKE_SET
 # Check architecture signature begin
 GRAS_ARCH
 # Check architecture signature end
+GRAS_CHECK_STRUCT_COMPACTION
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -47,11 +53,18 @@ AC_FUNC_MALLOC
 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?
-GNOME_GTKDOC_CHECK
+GTK_DOC_CHECK()
 
 dnl ####[ Search libs ]#######################################################
-dnl A CI_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)
 
@@ -75,8 +88,6 @@ AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
 
-AC_SUBST(SED)
-
 dnl ####[ Makes the output ]###################################################
 AC_CONFIG_FILES([
   Makefile
@@ -91,12 +102,16 @@ AC_CONFIG_FILES([
     src/examples/Makefile 
       src/examples/ping/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;
+     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])
 
+#      src/examples/pastry/Makefile
 #    src/modules/Makefile
 #      src/examples/bandwidth/Makefile src/examples/saturate/Makefile
 #      src/examples/alnem/Makefile