X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88b195682c0062b55de5248962d736658f86de50..a63b491b014ce7061f61b6fd94876b9abd6ceff2:/configure.ac

diff --git a/configure.ac b/configure.ac
index 5094f00a29..1fc372f727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,9 @@ AC_PREREQ(2.59)
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.2],[martin.quinson@ens-lyon.fr])
-AC_CONFIG_SRCDIR([src/include/gras.h])
+AC_INIT([simgrid],[2.90],[arnaud.legrand@imag.fr])
+#AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
+AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 
 AC_REVISION($Revision$)
@@ -43,7 +44,15 @@ GRAS_CHECK_STRUCT_COMPACTION
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h stdlib.h string.h unistd.h])
+AC_HEADER_TIME
+AC_CHECK_HEADERS([sys/socket.h winsock.h winsock2.h \
+                  sys/stat.h \
+		  ucontext.h \
+		  sys/time.h \
+		  errno.h unistd.h ])
+AC_CHECK_FUNCS([gettimeofday \
+                getdtablesize \
+                sysconf])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -51,9 +60,8 @@ AC_C_INLINE
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([memset strchr strerror usleep])
+dnl A C_FUNC_MEMCMP
+dnl A C_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
@@ -62,22 +70,46 @@ AC_PROG_LEX
 if test "$LEX" != flex; then
   LEX="$SHELL $missing_dir/missing flex"
 fi
-								  
-# Can we rebuild the documentation?
-GTK_DOC_CHECK()
+		
+# Can we rebuild the xml-lexers from the XML specification?
+# if not, simply touch the flex source files (which are distributed in
+#  tarballs even if generated by flexml) and hope for the best.
+AC_CHECK_PROG(FLEXML,flexml,,NOTFOUND)
+AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != NOTFOUND)
 
 dnl ####[ Search libs ]#######################################################
-ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
-AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
+dnl A CI_PACKAGE([S imGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
+dnl A M_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
+dnl if test x$HAVE_SimGrid = xyes; then
+dnl   SIMGRID_DEP="-lsimgrid"
+dnl else
+  SIMGRID_DEP=""
+dnl fi
+AC_SUBST([SIMGRID_DEP])
+
 
 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"])
-	
+GRAS_DEP=""
+AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"])
+AC_CHECK_LIB(socket, connect,    [GRAS_DEP="$GRAS_DEP -lsocket"])
+
+AC_MSG_CHECKING(for extra dependencies of libgras)
+case $host_os in
+  *mingw* ) GRAS_DEP=-lws2_32;;
+esac
+	   
+if test "x$GRAS_DEP" = x; then 
+   AC_MSG_RESULT(none)
+else
+   AC_MSG_RESULT($GRAS_DEP)
+fi
+AC_SUBST([GRAS_DEP])
+
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
+#   enable_iso_c=yes             # Let's go funky
    GNOME_COMPILE_WARNINGS(yes)
 fi
 
@@ -91,31 +123,41 @@ WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
 
 dnl ####[ Makes the output ]###################################################
+#    examples/bandwidth/Makefile examples/bandwidth/test_sg
+#    examples/pastry/Makefile    examples/pastry/test_sg
+
 AC_CONFIG_FILES([
   Makefile
+  include/Makefile
   src/Makefile
-    src/include/Makefile
-    src/base/Makefile
-      src/base/Tests/Makefile
-      src/base/Tests/run_tests
-        src/base/Tests/trp_tcp_usage
-        src/base/Tests/trp_file_usage
-    src/examples/Makefile 
-      src/examples/ping/Makefile 
+  src/amok/Makefile
+  examples/Makefile 
+  examples/ping/Makefile      examples/ping/test_sg     examples/ping/test_rl
+  examples/msg/Makefile 
   doc/Makefile
   tools/compile-remote-worker
+  testsuite/Makefile
+  testsuite/run_tests    
+  testsuite/gras/trp_tcp_usage
+  testsuite/gras/trp_file_usage
 ],[
-     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 testsuite/run_tests          && chmod +x testsuite/run_tests;
+     test -e testsuite/gras/trp_tcp_usage && chmod +x testsuite/gras/trp_tcp_usage;
+     test -e testsuite/gras/trp_file_usage&& chmod +x testsuite/gras/trp_file_usage;
      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 examples/ping/test_sg        && chmod +x examples/ping/test_sg;
+     test -e examples/ping/test_rl        && chmod +x examples/ping/test_rl;
+#     test -e examples/bandwidth/test_sg   && chmod +x examples/bandwidth/test_sg;
+     test -e examples/pastry/test_sg      && chmod +x examples/pastry/test_sg;
+     chmod +x $srcdir/tools/gras-check-arch;
+])
+
+
+
+#    examples/saturate/Makefile  examples/saturate/test_sg
+#    examples/alnem/Makefile     examples/alnem/test_sg
+
 
-#      src/examples/pastry/Makefile
-#    src/modules/Makefile
-#      src/examples/bandwidth/Makefile src/examples/saturate/Makefile
-#      src/examples/alnem/Makefile 
 
 AC_OUTPUT