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

diff --git a/configure.ac b/configure.ac
index ca6f9249c5..b662e90611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 AC_PREREQ(2.59)
 
-#We need a recent ACI
-ACI_PREREQ(2003.01.16)
+# We need a recent ACI
+# A CI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
+AC_INIT([simgrid],[2.91],[simgrid2-users@listes.ens-lyon.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 
@@ -18,9 +18,6 @@ AC_CONFIG_MACRO_DIR(acmacro)
 # It seems to be called ACLOCAL_INCLUDE...
 # A M_ACLOCAL_INCLUDE(acmacro)
 
-
-
-
 AC_PROG_LIBTOOL
 
 # declare the modules (no optional module)
@@ -47,25 +44,12 @@ AC_HEADER_TIME
 AC_CHECK_HEADERS([sys/socket.h winsock.h winsock2.h \
                   sys/stat.h \
 		  ucontext.h \
-		  sys/time.h ])
+		  sys/time.h \
+		  errno.h unistd.h ])
 AC_CHECK_FUNCS([gettimeofday \
                 getdtablesize \
                 sysconf])
 
-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
 AC_C_INLINE
@@ -75,25 +59,33 @@ AC_TYPE_SIZE_T
 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
-# 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?
-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],,:)
-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
@@ -112,6 +104,17 @@ AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
 
+# 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_FLEX(2.5.30)
+		
+# 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 ####[ Makes the output ]###################################################
 #    examples/bandwidth/Makefile examples/bandwidth/test_sg
 #    examples/pastry/Makefile    examples/pastry/test_sg
@@ -122,29 +125,33 @@ AC_CONFIG_FILES([
   src/Makefile
   src/amok/Makefile
   examples/Makefile 
-    examples/ping/Makefile      examples/ping/test_sg     examples/ping/test_rl
+    examples/msg/Makefile 
+    examples/gras/Makefile 
+      examples/gras/ping/Makefile  examples/gras/ping/test_sg  examples/gras/ping/test_rl
   doc/Makefile
+    doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
   tools/compile-remote-worker
   testsuite/Makefile
-    testsuite/run_tests    
-    testsuite/gras/trp_tcp_usage
-    testsuite/gras/trp_file_usage
+  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;
-     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;
+     test -e examples/gras/ping/test_sg   && chmod +x examples/gras/ping/test_sg;
+     test -e examples/gras/ping/test_rl   && chmod +x examples/gras/ping/test_rl;
+#     test -e examples/gras/bandwidth/test_sg   && chmod +x examples/gras/bandwidth/test_sg;
+     test -e examples/gras/pastry/test_sg && chmod +x examples/gras/pastry/test_sg;
      chmod +x $srcdir/tools/gras-check-arch;
 ])
 
 
 
-#    examples/saturate/Makefile  examples/saturate/test_sg
-#    examples/alnem/Makefile     examples/alnem/test_sg
+
+#    examples/gras/saturate/Makefile  examples/gras/saturate/test_sg
+#    examples/gras/alnem/Makefile     examples/gras/alnem/test_sg