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

diff --git a/configure.ac b/configure.ac
index 913d81e6eb..d6af0b764e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-AC_PREREQ(2.57)
+ AC_PREREQ(2.57)
 
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.0.040304],[martin.quinson@ens-lyon.fr])
+AC_INIT([GRAS],[0.0.2],[martin.quinson@ens-lyon.fr])
 AC_CONFIG_SRCDIR([src/include/gras.h])
 AC_REVISION($Revision$)
 dnl A C_CONFIG_SUBDIRS(src/nws_portability)
@@ -29,8 +29,9 @@ AC_PROG_CC
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
 
-# Check architecture signature
+# Check architecture signature begin
 GRAS_ARCH
+# Check architecture signature end
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -50,10 +51,13 @@ AC_CHECK_FUNCS([memset strchr strerror usleep])
 GNOME_GTKDOC_CHECK
 
 dnl ####[ Search libs ]#######################################################
-ACI_PACKAGE_SAVED(XML,[XML library (version XML2)],xml2-config,,,:)
-ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h])
+dnl A CI_PACKAGE_SAVED(XML,[XML library (version XML2)],xml2-config,,,:)
+ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
+AM_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
 
-dnl A C_CHECK_LIB(pthread, pthread_mutex_lock)
+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"])
 	
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE
@@ -71,6 +75,8 @@ AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
 
+AC_SUBST(SED)
+
 dnl ####[ Makes the output ]###################################################
 AC_CONFIG_FILES([
   Makefile
@@ -82,11 +88,8 @@ AC_CONFIG_FILES([
       src/base/Tests/run_tests
         src/base/Tests/trp_tcp_usage
         src/base/Tests/trp_file_usage
-    src/modules/Makefile
     src/examples/Makefile 
       src/examples/ping/Makefile 
-      src/examples/bandwidth/Makefile src/examples/saturate/Makefile
-      src/examples/alnem/Makefile 
   doc/Makefile
 ],[( 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;
@@ -94,11 +97,15 @@ AC_CONFIG_FILES([
      test -e src/base/Tests/run_tests     && chmod +x src/base/Tests/run_tests;
      chmod +x src/examples/ping/test_rl; chmod +x src/examples/ping/test_sg])
 
+#    src/modules/Makefile
+#      src/examples/bandwidth/Makefile src/examples/saturate/Makefile
+#      src/examples/alnem/Makefile 
+
 AC_OUTPUT
 
 echo "
 
-Configuration of package \`${PACKAGE}':
+Configuration of package \`${PACKAGE}' on $gras_arch_name (=$gras_arch):
 
 	Compiler:	${CC}