X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fdf4688dcb2bbde0f0d651f36fe1ec56b8b51a2..9ea25ef8eaa7822f25f60a21a9daf84c49b053e1:/configure.ac

diff --git a/configure.ac b/configure.ac
index 98c1e1233e..440257c90a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,56 +1,41 @@
-AC_PREREQ(2.59)
 
-#We need a recent ACI
-ACI_PREREQ(2003.01.16)
+######################
+## Setup the autotools
+##
 
-AC_INIT([simgrid],[2.90],[arnaud.legrand@imag.fr])
-#AC_INIT([GRAS],[0.7],[martin.quinson@ens-lyon.fr])
+AC_PREREQ(2.59)
+AC_INIT([simgrid],[2.94],[simgrid-devel@lists.gforge.inria.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
 
-
-AC_PROG_CC
+###############
+## System checks
+##
+SG_CONFIGURE_PART(System checks...)
+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])
 
@@ -59,69 +44,71 @@ 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])
+###################################
+## SimGrid and GRAS specific checks
+##
 
-# 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
-  AC_MSG_NOTICE([Will not rebuild the parsers. I want flex.])
-  LEX="$SHELL $missing_dir/missing flex";
-else
-changequote(<<, >>)dnl because of the regexp [[:blank:]]  
-  FLEX_VERSION=`flex --version`;
-  FLEX_VER_MAJ=`echo $FLEX_VERSION | sed 's/[^0-9\.]*//g' | sed 's/\..*//g'`;
-  FLEX_VER_MED=`echo $FLEX_VERSION | sed 's/[^0-9\.]*//g' | sed 's/[0-9]*\.\([0-9]*\)\.[0-9]*/\1/g'`;
-  FLEX_VER_MIN=`echo $FLEX_VERSION | sed 's/[^0-9\.]*//g' | sed 's/.*\.//g'`;
-changequote([, ])dnl back to normality, there is no regexp afterward
-  if test $FLEX_VER_MAJ -lt 2 ; then
-    AC_MSG_NOTICE([Will not rebuild the parsers. Your flex is too old.])
-    LEX="$SHELL $missing_dir/missing flex";
+SG_CONFIGURE_PART(Checking GRAS architecture signature...)
+# Check architecture signature begin
+GRAS_ARCH
+# Check architecture signature end
+GRAS_CHECK_STRUCT_COMPACTION
+
+
+SG_CONFIGURE_PART([Checking for threads, contexts or assimilated...])
+AC_CHECK_UCONTEXT
+AC_MSG_CHECKING(on top of what can we build the contexts)
+AC_ARG_WITH(context,
+  [  --with-context=[ucontext/pthread]   Use either (System V) swapcontext or pthread [[default=auto]].],,
+  with_context=auto)
+
+case $with_context in
+ ucontext) ;;
+ pthread) ;;
+ auto) with_context=ucontext;;
+ *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;;
+esac
+
+if test "x$with_context" = "xucontext" ; then
+  if test "x$ac_check_ucontext" = "xyes"; then
+    AC_MSG_RESULT(found ucontext.h. Great!)
+    AC_DEFINE([USE_UCONTEXT],1,[Define if we use ucontext or not])
   else
-    if test $FLEX_VER_MAJ -eq 2 ; then
-      if test $FLEX_VER_MED -lt 5 ; then
-        AC_MSG_NOTICE([Will not rebuild the parsers. Your flex is too old.])
-        LEX="$SHELL $missing_dir/missing flex";
-      else
-        if test $FLEX_VER_MED -eq 5 ; then
-          if test $FLEX_VER_MIN -lt 31 ; then
-             AC_MSG_NOTICE([Will not rebuild the parsers. Your flex is too old.])
-             LEX="$SHELL $missing_dir/missing flex";
-          fi;
-        fi;
-      fi;
-    fi;
-  fi;
+    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(there is no ucontext on windows, and none is needed.")
+    else
+      AC_MSG_RESULT([[no working ucontext found. Falling back to pthreads]])
+      with_context=pthread
+    fi
+  fi
 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)
-
-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])
-
 
+if test "x$with_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 --with-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.)
+fi
+
+#########################################
+## Check for libraries extra-dependencies
+##
+
+SG_CONFIGURE_PART(Checking extra libraries 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 
@@ -131,24 +118,47 @@ 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)
+   # Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt]
+   enable_compile_warnings=yes
 fi
+SG_COMPILE_FLAGS
 
 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)
 
-dnl ####[ Makes the output ]###################################################
+# 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,`which flexml`,NOTFOUND)
+AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
+
+###################
+## Makes the output
+##
+
+
 #    examples/bandwidth/Makefile examples/bandwidth/test_sg
 #    examples/pastry/Makefile    examples/pastry/test_sg
 
@@ -158,31 +168,41 @@ 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/msg/Makefile          examples/msg/run_msg_test
+    examples/gras/Makefile 
+      examples/gras/ping/Makefile  examples/gras/ping/test_sg  examples/gras/ping/test_rl
+      examples/gras/timer/Makefile examples/gras/timer/test_sg examples/gras/timer/test_rl
+      examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
   doc/Makefile
-    doc/Doxyfile.main           doc/Doxyfile.API          doc/Doxyfile.Examples   
-  tools/compile-remote-worker
+    doc/Doxyfile
+  tools/graspe-slave            tools/Makefile
+    tools/gras/Makefile
   testsuite/Makefile
   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;
-     chmod +x $srcdir/tools/gras-check-arch;
+    for file in                                                 \
+     testsuite/run_tests                                        \
+     testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \
+     tools/graspe-slave           tools/graspe-master           \
+     examples/msg/run_msg_test                                  \
+     examples/gras/ping/test_sg   examples/gras/ping/test_rl    \
+     examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
+     examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
+    ; do                                                        \
+      test -e $file && chmod +x $file;                          \
+    done
+    chmod +x $srcdir/tools/gras-check-arch;
 ])
 
+#    examples/gras/pastry/test_sg   
+#    examples/gras/bandwidth/test_sg 
+
 
 
-#    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
 
 
 
@@ -190,7 +210,7 @@ AC_OUTPUT
 
 echo "
 
-Configuration of package \`${PACKAGE}' on $gras_arch_name (=$gras_arch):
+Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (=$gras_arch):
 
 	Compiler:	${CC}