X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5fa49ab49ed995aabd7e0e8b9323493c03a782f..4318208d7db16e05e147c4a5c5b31a04cff2d02e:/configure.ac

diff --git a/configure.ac b/configure.ac
index ad712db17f..8e9d8bc121 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,52 +1,41 @@
-AC_PREREQ(2.59)
 
-# We need a recent ACI
-# A CI_PREREQ(2003.01.16)
+######################
+## Setup the autotools
+##
 
-AC_INIT([simgrid],[2.92-cvs],[simgrid2-users@listes.ens-lyon.fr])
+AC_PREREQ(2.59)
+AC_INIT([simgrid],[2.93-cvs],[simgrid2-users@listes.ens-lyon.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
+# A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
 
 AC_REVISION($Revision$)
 AC_CANONICAL_TARGET
 AC_LANG([C])
 
 AM_INIT_AUTOMAKE(gnu)
-# MACRO_DIR should tell aclocal to search for my macro. That's the autoconf
-# maintainer plan, but automake does not implement this yet (as in 1.8)
 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)
-
-dnl
-dnl Load anything under acmacro/*.m4
-dnl
-dnl test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 ACLOCAL="$ACLOCAL -I acmacro"
+AC_PROG_LIBTOOL
 
+###############
+## Basic checks
+##
 
-AC_PROG_CC
+AC_PROG_CC(xlC gcc cc)
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
-
-# Check architecture signature begin
-GRAS_ARCH
-# Check architecture signature end
-GRAS_CHECK_STRUCT_COMPACTION
+AC_CHECK_PRINTF_NULL
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_TIME
-AC_CHECK_HEADERS([sys/socket.h winsock.h winsock2.h \
+AC_CHECK_HEADERS([sys/socket.h \
                   sys/stat.h \
-		  ucontext.h \
+		  windows.h winsock.h winsock2.h \
 		  sys/time.h \
 		  errno.h unistd.h ])
-AC_CHECK_FUNCS([gettimeofday \
+AC_CHECK_FUNCS([gettimeofday usleep \
                 getdtablesize \
                 sysconf])
 
@@ -55,29 +44,60 @@ AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
 
-# Checks for library functions.
-dnl A C_FUNC_MEMCMP
-dnl A C_CHECK_FUNCS([memset strchr strerror usleep])
-
-dnl ####[ Search libs ]#######################################################
-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])
+###################################
+## SimGrid and GRAS specific checks
+##
 
+# Check architecture signature begin
+GRAS_ARCH
+# Check architecture signature end
+GRAS_CHECK_STRUCT_COMPACTION
 
+AC_ARG_ENABLE(context,
+  [  --enable-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=pthread]].],,
+  enable_context=pthread)
+AC_MSG_CHECKING(on top of what can we build the contexts)
+if test "x$enable_context" = "xucontext"; then
+  AC_CHECK_HEADERS([ucontext.h])
+  ac_header=ucontext.h
+  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+  if test `eval echo '${'$as_ac_Header'}'` = yes; then
+    AC_MSG_RESULT(found ucontext.h. Great!)
+  else
+    ac_header=windows.h
+    as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+    if test `eval echo '${'$as_ac_Header'}'` = yes; then
+      AC_MSG_RESULT(you don't have ucontext.h but we provide an alternative for windows so you should be fine.")
+    else
+      AC_MSG_RESULT([[cannot find ucontext. I'm going to try as if you had set --enable-context=pthreads !]])
+      enable_context=pthreads
+    fi
+  fi
+else if test "x$enable_context" = "xpthread"; then
+  AC_CHECK_HEADERS([pthread.h])
 dnl A C_CHECK_LIB(pthread, pthread_mutex_lock, LIBS="$LIBS -lpthread")
+  AC_CHECK_LIB(pthread,pthread_create,,
+    [AC_MSG_ERROR([[Cannot find pthreads, no way (try --enable-context=ucontext if you haven't already tried).]])])
+  AC_DEFINE([USE_PTHREADS],1,[Define if we USE pthreads or not])
+  AC_MSG_RESULT(You have pthreads. Let's use them.)
+else 
+  AC_MSG_ERROR("--enable-context must be either ucontext or pthread")
+fi fi
+
+#########################################
+## Check for libraries extra-dependencies
+##
+
+SIMGRID_DEP=""
+AC_SUBST([SIMGRID_DEP])
+
 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;;
+  *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32" ;;
 esac
 	   
 if test "x$GRAS_DEP" = x; then 
@@ -87,11 +107,14 @@ else
 fi
 AC_SUBST([GRAS_DEP])
 
-dnl ####[ maint mode ]#######################################################
+##############################################
+## Enhance maintainer mode and SUBST variables
+## (must be placed after any compilation tests since our overprotective flags
+##  let some tests fail)
+
 AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
-#   enable_iso_c=yes             # Let's go funky
    GNOME_COMPILE_WARNINGS(yes)
 fi
 
@@ -99,7 +122,10 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-dnl ####[ check for some programms ]###########################################
+#####################
+## Check for programs
+##
+
 AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
 WARNING="This file is generated, do not edit"
 AC_SUBST(WARNING)
@@ -115,7 +141,11 @@ AC_PROG_FLEX(2.5.30)
 AC_CHECK_PROG(FLEXML,flexml,,NOTFOUND)
 AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != NOTFOUND)
 
-dnl ####[ Makes the output ]###################################################
+###################
+## Makes the output
+##
+
+
 #    examples/bandwidth/Makefile examples/bandwidth/test_sg
 #    examples/pastry/Makefile    examples/pastry/test_sg