No more need of these ones...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ca6f924..6072edc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -47,25 +47,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
@@ -88,12 +75,32 @@ 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