Make a proper gras/ directory in the include one, and stop fooling with recursive...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0fa95e8..6410e43 100644 (file)
--- 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)
 
 
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 

-AC_INIT([GRAS],[0.1],[martin.quinson@ens-lyon.fr])
+AC_INIT([GRAS],[0.2],[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) 
 # 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
 
 
 AC_PROG_LIBTOOL
 


@@ -26,7 +28,7 @@ AC_PROG_LIBTOOL
 dnl
 dnl Load anything under acmacro/*.m4
 dnl
 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"
 
 
 ACLOCAL="$ACLOCAL -I acmacro"
 
 


@@ -103,7 +105,7 @@ AC_CONFIG_FILES([
       src/examples/ping/Makefile 
   doc/Makefile
   tools/compile-remote-worker
       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 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;