X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f22dac67ffee18ea9dde60e1a06fb3015a0ea5..92bb2be06658bec5abe69a30642ed469e47708fd:/configure.ac

diff --git a/configure.ac b/configure.ac
index d733f15e9d..9c6b3307fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@ AC_PREREQ(2.59)
 #We need a recent ACI
 ACI_PREREQ(2003.01.16)
 
-AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
+AC_INIT([simgrid],[2.90],[arnaud.legrand@imag.fr])
+#AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 
@@ -47,7 +48,8 @@ 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])
@@ -68,38 +70,44 @@ AC_PROG_LEX
 if test "$LEX" != flex; then
   LEX="$SHELL $missing_dir/missing flex"
 fi
-								  
+		
+# 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)
+
 # 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)
-if test x$HAVE_SimGrid = xyes; then
-  GRAS_SG_DEP="-lsimgrid"
-else
-  GRAS_SG_DEP=""
-fi
-AC_SUBST([GRAS_SG_DEP])
+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")
-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"])
+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 libgrasrl)
+AC_MSG_CHECKING(for extra dependencies of libgras)
 case $host_os in
-  *mingw* ) GRAS_RL_DEP=-lws2_32;;
+  *mingw* ) GRAS_DEP=-lws2_32;;
 esac
 	   
-if test "x$GRAS_RL_DEP" = x; then 
+if test "x$GRAS_DEP" = x; then 
    AC_MSG_RESULT(none)
 else
-   AC_MSG_RESULT($GRAS_RL_DEP)
+   AC_MSG_RESULT($GRAS_DEP)
 fi
-AC_SUBST([GRAS_RL_DEP])
+AC_SUBST([GRAS_DEP])
 
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE