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

diff --git a/configure.ac b/configure.ac
index 32b37617c3..b7d6631009 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ AC_PREREQ(2.59)
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.1.1],[martin.quinson@ens-lyon.fr])
-AC_CONFIG_SRCDIR([src/include/gras.h])
+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 +43,26 @@ 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\
+		  sys/time.h ])
+AC_CHECK_FUNCS([gettimeofday ])
+
+
+AC_MSG_CHECKING(how to link against winsock)
+save_LIBS="$LIBS"
+case $host_os in
+  *mingw* ) GRAS_WINSOCK_DEP=-lws2_32;;
+  * ) GRAS_WINSOCK_DEP="";;
+esac
+	   
+if test x$GRAS_WINSOCK_DEP = x; then 
+   AC_MSG_RESULT(not needed)
+else
+   AC_MSG_RESULT($winsock_ver)
+fi
+AC_SUBST([GRAS_WINSOCK_DEP])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -51,9 +70,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
@@ -65,6 +83,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],,:)
@@ -78,6 +97,7 @@ 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,32 +111,40 @@ 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/include/modules/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
   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;
+  testsuite/Makefile
+    testsuite/run_tests    
+    testsuite/gras/trp_tcp_usage
+    testsuite/gras/trp_file_usage
+],[
+     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/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;
+     chmod +x $srcdir/examples/ping/test_rl
+])
+
+
+
+#    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