Remove the headers already loaded from somewhere else. Keep the remaining for the...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f0db123..d733f15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,14 @@ 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 ])
+AC_CHECK_FUNCS([gettimeofday \
+                getdtablesize \
+                sysconf])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -69,11 +76,31 @@ AC_SUBST([htmldir],         ['${datadir}/doc/gras/html'])dnl
 dnl ####[ Search libs ]#######################################################
 ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
 AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
+if test x$HAVE_SimGrid = xyes; then
+  GRAS_SG_DEP="-lsimgrid"
+else
+  GRAS_SG_DEP=""
+fi
+AC_SUBST([GRAS_SG_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_RL_DEP=""
+AC_CHECK_LIB(nsl, gethostbyname, [GRAS_RL_DEP="$GRAS_RL_DEP -lnsl"])
+AC_CHECK_LIB(socket, connect,    [GRAS_RL_DEP="$GRAS_RL_DEP -lsocket"])
+
+AC_MSG_CHECKING(for extra dependencies of libgrasrl)
+case $host_os in
+  *mingw* ) GRAS_RL_DEP=-lws2_32;;
+esac
+          
+if test "x$GRAS_RL_DEP" = x; then 
+   AC_MSG_RESULT(none)
+else
+   AC_MSG_RESULT($GRAS_RL_DEP)
+fi
+AC_SUBST([GRAS_RL_DEP])
+
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
@@ -93,13 +120,15 @@ 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/amok/Makefile
   examples/Makefile 
-    examples/ping/Makefile      examples/ping/test_sg
+    examples/ping/Makefile      examples/ping/test_sg     examples/ping/test_rl
   doc/Makefile
   tools/compile-remote-worker
   testsuite/Makefile
@@ -112,9 +141,10 @@ AC_CONFIG_FILES([
      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;
      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;
-     chmod +x $srcdir/examples/ping/test_rl
 ])
 
 
@@ -122,7 +152,7 @@ AC_CONFIG_FILES([
 #    examples/saturate/Makefile  examples/saturate/test_sg
 #    examples/alnem/Makefile     examples/alnem/test_sg
 
-#    examples/pastry/Makefile    examples/pastry/test_sg
+
 
 AC_OUTPUT