cleanup the mecanism in charge of declaring the library dependencies to libtool

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 03d1d3b..d733f15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.59)
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.6.3],[martin.quinson@ens-lyon.fr])
+AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 
@@ -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
@@ -51,9 +58,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
@@ -70,16 +76,36 @@ 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 
 then
-#   enable_iso_c=yes                 Ouais, un autre jour
+#   enable_iso_c=yes             # Let's go funky
    GNOME_COMPILE_WARNINGS(yes)
 fi
 
@@ -93,13 +119,16 @@ 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/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,23 +141,18 @@ 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
 ])
 
-#    src/gros/Makefile
-#    src/gras/Makefile
 
-#      testsuite/gras/Makefile
-#
-#        testsuite/gras/trp_tcp_usage
-#        testsuite/gras/trp_file_usage
+
+#    examples/saturate/Makefile  examples/saturate/test_sg
+#    examples/alnem/Makefile     examples/alnem/test_sg
 
 
-#      src/examples/pastry/Makefile
-#    src/amok/Makefile
-#      src/examples/bandwidth/Makefile src/examples/saturate/Makefile
-#      src/examples/alnem/Makefile 
 
 AC_OUTPUT