Update

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index add5810..32b3761 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,34 @@
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
 
 #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.1.1],[martin.quinson@ens-lyon.fr])
 AC_CONFIG_SRCDIR([src/include/gras.h])
-AC_REVISION($Revision$)
-dnl A C_CONFIG_SUBDIRS(src/nws_portability)
+AC_CONFIG_HEADERS([src/gras_config.h])
 
+AC_REVISION($Revision$)
 AC_CANONICAL_TARGET
 AC_LANG([C])
 
-AM_CONFIG_HEADER(src/gras_config.h)
-AM_INIT_AUTOMAKE
+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)
+
+
 
-AM_PROG_LIBTOOL
+
+AC_PROG_LIBTOOL
 
 # declare the modules (no optional module)
 
 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"
 
 
@@ -29,8 +36,10 @@ AC_PROG_CC
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
 
-# Check architecture signature
+# Check architecture signature begin
 GRAS_ARCH
+# Check architecture signature end
+GRAS_CHECK_STRUCT_COMPACTION
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -46,14 +55,24 @@ 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 ]#######################################################
-ACI_PACKAGE_SAVED(XML,[XML library (version XML2)],xml2-config,,,:)
-ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h])
+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
@@ -82,22 +101,28 @@ AC_CONFIG_FILES([
       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/bandwidth/Makefile src/examples/saturate/Makefile
-      src/examples/alnem/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/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 
 
 AC_OUTPUT
 
 echo "
 
-Configuration of package \`${PACKAGE}':
+Configuration of package \`${PACKAGE}' on $gras_arch_name (=$gras_arch):
 
        Compiler:       ${CC}