X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20404b3a4c98b620cb4cd18ec1c2668ac278eb6b..ac1ac47758c06efeca6b7e80bcea7a769b946c9a:/configure.ac

diff --git a/configure.ac b/configure.ac
index edd13e7a7f..3b86716f0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,8 @@ else
       AC_ERROR([no appropriate backend found])
     fi
 fi
+AM_CONDITIONAL(IS_WINDOWS,test x$windows_context = xyes)
+
 
 dnl #
 dnl #  3. allow decision to be overridden by user
@@ -160,8 +162,9 @@ if test "x$with_context" = "xpthread"; then
   AC_CHECK_LIB(pthread,pthread_create,,
     [AC_MSG_ERROR([[Cannot find pthreads (try --with-context=ucontext if you haven't already tried).]])])
   AC_DEFINE([CONTEXT_THREADS],1,[Define if xbt contexts are based on our threads implementation or not])
-  AC_MSG_RESULT(You have pthreads. Let's use them.)
+  AC_MSG_RESULT(You have pthreads and requested for them. Fine.)
 fi
+AM_CONDITIONAL(CONTEXT_THREADS,test "x$with_context" != xucontext)
 
 dnl #
 dnl #  4. determine a few additional details
@@ -187,30 +190,9 @@ fi
 SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 
 SIMGRID_DEP=""
+SMPI_DEP=""
 GRAS_DEP=""
 
-#########################################
-## Build optional modules (gtnets)
-##
-AC_ARG_WITH(gtnets,
-  AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]),
-  gtnets_path="$withval",gtnets_path="NO")
-if test "x$gtnets_path" = "xNO" ; then
-  AC_MSG_RESULT(Eventually you will come to GTNetS.)
-else  
-  AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****)
-  AC_DEFINE(USE_GTNETS, 1, [Indicates whether we should use GTNetS or not])
-  if ! test -e $gtnets_path ; then
-    AC_MSG_ERROR(Provided path to GTNetS include files ($gtnets_path) do not exist!)
-  fi
-  GTNETS_CFLAGS=-I$gtnets_path/include
-  AC_SUBST([GTNETS_CFLAGS])  
-  GTNETS_LDFLAGS=-L$gtnets_path/lib
-  AC_SUBST([GTNETS_LDFLAGS])
-  SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS -lgtnets"
-fi
-AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO)
-
 if test xpthread=xyes ; then 
   # if the pthreads are usable
   if test "x$with_context" = "xpthread" ; then
@@ -223,19 +205,84 @@ if test xpthread=xyes ; then
   fi
 fi
 
-AC_MSG_CHECKING(for csdp)
-sdp=no
-AC_CHECK_LIB(sdp,sdp,csdp=yes, csdp=no,-llapack -lblas -lm)
-if test "x$csdp" = xyes; then 
-  SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm"
-  AC_MSG_RESULT(Found working sdp library.)
-  AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not])
-else
-  AC_MSG_RESULT(Could not find any working sdp library.)
-fi;
+#########################################
+## Build optional modules (gtnets)
+##
+gtnets=no
+AC_ARG_WITH(gtnets,
+  AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]),
+  gtnets_path="$withval",gtnets_path="no")
+if test "x$gtnets_path" = "xno" ; then
+  AC_MSG_RESULT(Eventually you will come to GTNetS.)
+else  
+  AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****)
+  AC_MSG_CHECKING(for gtnets)
+  AC_LANG_PUSH([C++])  
+  GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib"
+  GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
+  LDFLAGS_SAV=$LDFLAGS	
+  CPPFLAGS_SAV=$CPPFLAGS
+  CPPFLAGS+=$GTNETS_CPPFLAGS
+  LDFLAGS+=$GTNETS_LDFLAGS
+  AC_TRY_LINK([ #include <simulator.h>
+              ], [Simulator s; s.RunUntilNextCompletion();], gtnets=yes, gtnets=no)
+  CPPFLAGS=$CPPFLAGS_SAV
+  LDFLAGS=$LDFLAGS_SAV
+  AC_LANG_POP([C++])  
+
+  if test "x$gtnets" = xyes ; then 
+    AM_CPPFLAGS="$AM_CPPFLAGS $GTNETS_CPPFLAGS"
+    SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS"
+    AC_MSG_RESULT(Found working gtnets library.)
+    AC_DEFINE(HAVE_GTNETS, 1, [Indicates whether we have the GTNETS library or not])
+  else
+    AC_MSG_RESULT(Could not find any working gtnets library or not patched version, see config.log for details .)
+  fi
+fi
+AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno)
+
+#########################################
+## Build optional modules (csdp)
+##
+csdp=no
+AC_ARG_WITH(csdp,
+  AS_HELP_STRING([--with-csdp], [Path to csdp installation (default to empty, i.e. not using csdp)]),
+  csdp_path="$withval",csdp_path="no")
+if test "x$csdp_path" = "xno" ; then
+  AC_MSG_RESULT(Eventually you will come to csdp.)
+else  
+  AC_MSG_RESULT(***** You have decided to use csdp. Let's check whether it works or not *****)
+  AC_MSG_CHECKING(for csdp)
+  CSDP_LDFLAGS="-L$csdp_path/lib -lsdp -llapack -lblas -lm"
+  CSDP_CPPFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp"
+
+  AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,$CSDP_LDFLAGS)
+  
+  CPPFLAGS_SAV=$CPPFLAGS
+  CPPFLAGS+=$CSDP_CPPFLAGS
+  AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no, [])
+  CPPFLAGS=$CPPFLAGS_SAV
+
+  
+
+  if test "x$csdp_lib = xyes" -a "x$csdp_header = xyes" ; then
+     csdp=yes;
+  else 
+     csdp=no;
+  fi
+  if test "x$csdp" = xyes; then 
+    AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS"
+    SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS"
+    AC_MSG_RESULT(Found working sdp library.)
+    AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not])
+  else
+    AC_MSG_RESULT(Could not find any working sdp library.)
+  fi;
+fi
 AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno)
 
 AC_SUBST([SIMGRID_DEP])
+AC_SUBST([SMPI_DEP])
 
 AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"])
 AC_CHECK_LIB(socket, connect,    [GRAS_DEP="$GRAS_DEP -lsocket"])
@@ -243,10 +290,12 @@ 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="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32";
-            AC_SUBST(AM_CFLAGS,-DDLL_EXPORT)
+            AM_CPPFLAGS="$AM_CPPFLAGS -DDLL_EXPORT"
             AC_DEFINE(CONTEXT_THREADS,1);;
 esac
-	   
+
+
+
 if test "x$GRAS_DEP" = x; then 
    AC_MSG_RESULT(none)
 else
@@ -277,14 +326,32 @@ then
 fi
 SG_COMPILE_FLAGS
 
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
+AC_SUBST([CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([LDFLAGS])
+AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([abs_builddir])
 AC_SUBST([abs_srcdir])
 AC_SUBST([abs_top_builddir])
 AC_SUBST([abs_top_srcdir])
 
+##############################################
+## Specific mode for build daemons.
+## (they compile the SVN without having the autotools installed)
+AC_ARG_ENABLE(botbuild,
+	      AS_HELP_STRING([--enable-botbuild], [Compilation mode for build daemons -- do not use it]),
+              botbuild=$enableval,botbuild=no)
+AM_CONDITIONAL(BOTBUILD_MODE,test x$botbuild != xno)
+
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes ; then
+  echo "ERROR: "
+  echo "ERROR: You have to enable the maintainer mode to compile the SVN."
+  echo "ERROR: For this, just call configure this way:"
+  echo "ERROR:"
+  echo "ERROR: ./configure '--enable-maintainer-mode' $ac_configure_args"
+  echo "ERROR:"
+  exit 1
+fi
 
 
 SG_CONFIGURE_PART(Check for Java bindings...)
@@ -410,16 +477,19 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([  
   testsuite/Makefile
   testsuite/run_tests    
-  testsuite/gras/trp_tcp_usage  testsuite/gras/trp_file_usage
 ],[
     for file in                                                 \
      testsuite/run_tests                                        \
-     testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \
     ; do                                                        \
       test -e $file && chmod +x $file;                          \
     done
 ])
 
+# Teshsuite (testsuite using tesh)
+AC_CONFIG_FILES([  
+  teshsuite/Makefile
+])
+
 # Documentation
 AC_CONFIG_FILES([
   doc/Makefile
@@ -445,14 +515,7 @@ fi
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
-      examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
-      examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh
-      examples/msg/sendrecv/sendrecv_KCCFLN05_Vegas.tesh
-      examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh
-      examples/msg/suspend/suspend.tesh
-      examples/msg/masterslave/masterslave.tesh
-      examples/msg/masterslave/masterslave_forwarder.tesh
-    examples/simdag/Makefile	    examples/simdag/test_simdag
+    examples/simdag/Makefile
     examples/gras/Makefile
       examples/gras/ping/Makefile   
       examples/gras/rpc/Makefile
@@ -470,7 +533,6 @@ AC_CONFIG_FILES([
 ],[
     for file in                                                 \
      \
-     examples/simdag/test_simdag				\
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
      examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
     ; do                                                        \
@@ -478,6 +540,10 @@ AC_CONFIG_FILES([
     done
 ])
 
+AC_CONFIG_FILES([
+  src/smpi/smpicc
+  src/smpi/smpirun
+])
 
 # GRAMINE_CUT_END
 
@@ -494,17 +560,25 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
 	LDFlags:	 ${LDFLAGS}
 
 	Context backend: ${with_context}
+	Compile Java:    ${use_java}
+	
+	Maintainer mode: ${USE_MAINTAINER_MODE}
+
 "
+if test x$botbuild = xyes ; then
+  echo "        This is a bot build. Do not specify --enable-botbuild if you are not a bot."
+  echo
+fi
 
-if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then
-  echo "WARNING:"
-  echo "WARNING: you seem to compile the CVS version without the maintainer mode."
-  echo "WARNING: You won't be able to build archives that way (make dist is likely to fail). "
-  echo "WARNING: If you want to enable the maintainer mode, juste specify it like this:"
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = xyes ; then
+  echo "WARNING: "
+  echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. "
+  echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead."
   echo "WARNING:"
-  echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args"
+  echo "WARNING: You won't be able to build archives until then (make dist is likely to fail). "
   echo "WARNING:"
 fi
+
 echo $build_id > stamp.configure
 
 exit 0;