X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2a0a99018ac40ded40ddd7b5a4049ad1658e36d..9b83bf67e3e87f77afbbe6dda2d61030c1c75856:/configure.ac

diff --git a/configure.ac b/configure.ac
index 1e1a5f9ef4..25786d25ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,25 @@
- AC_PREREQ(2.59)
+AC_PREREQ(2.59)
 
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.0.4],[martin.quinson@ens-lyon.fr])
+AC_INIT([GRAS],[0.6.1],[martin.quinson@ens-lyon.fr])
+AC_CONFIG_SRCDIR([src/include/gras.h])
+AC_CONFIG_HEADERS([src/gras_config.h])
 
+AC_REVISION($Revision$)
+AC_CANONICAL_TARGET
+AC_LANG([C])
 
-AC_CONFIG_SRCDIR([src/include/gras.h])
+AM_INIT_AUTOMAKE(gnu)
 # 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) 
+# It seems to be called ACLOCAL_INCLUDE...
+# A M_ACLOCAL_INCLUDE(acmacro)
 
-AC_REVISION($Revision$)
 
-AC_CANONICAL_TARGET
-AC_LANG([C])
 
-AC_CONFIG_HEADERS([src/gras_config.h])
-AM_INIT_AUTOMAKE
 
 AC_PROG_LIBTOOL
 
@@ -26,7 +28,7 @@ AC_PROG_LIBTOOL
 dnl
 dnl Load anything under acmacro/*.m4
 dnl
-test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+dnl test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 ACLOCAL="$ACLOCAL -I acmacro"
 
 
@@ -63,6 +65,7 @@ fi
 								  
 # Can we rebuild the documentation?
 GTK_DOC_CHECK()
+AC_SUBST([htmldir],         ['${datadir}/doc/gras/html'])dnl
 
 dnl ####[ Search libs ]#######################################################
 ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
@@ -93,7 +96,6 @@ AC_CONFIG_FILES([
   Makefile
   src/Makefile
     src/include/Makefile
-      src/include/modules/Makefile
     src/base/Makefile
       src/base/Tests/Makefile
       src/base/Tests/run_tests
@@ -101,15 +103,17 @@ AC_CONFIG_FILES([
         src/base/Tests/trp_file_usage
     src/examples/Makefile 
       src/examples/ping/Makefile 
+      src/examples/ping/test_sg
   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/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])
+     test -e src/examples/ping/test_sg    && chmod +x src/examples/ping/test_sg;
+     chmod +x $srcdir/tools/gras-check-arch;
+     chmod +x $srcdir/src/examples/ping/test_rl])
 
 #      src/examples/pastry/Makefile
 #    src/modules/Makefile