X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/080fe941d0cefc731c075d239acca77e8e324b70..a453c182504e579cc2525ae144033ea2b767baae:/configure.ac

diff --git a/configure.ac b/configure.ac
index 12173ed889..da3f2c8199 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_CANONICAL_TARGET
 AC_LANG([C])
 AM_PROG_GCJ
 
-AM_INIT_AUTOMAKE(gnu)
+AM_INIT_AUTOMAKE([gnu -Wno-portability])
 AC_CONFIG_MACRO_DIR(acmacro) 
 ACLOCAL="$ACLOCAL -I acmacro"
 
@@ -29,7 +29,7 @@ AC_PROG_LIBTOOL
 ###############
 ## System checks
 ##
-SG_CONFIGURE_PART(System checks...)
+SG_CONFIGURE_PART([System checks...])
 AC_PROG_CC(xlC gcc cc)
 AM_SANITY_CHECK
 AC_PROG_MAKE_SET
@@ -189,50 +189,92 @@ SG_CONFIGURE_PART(Checking extra libraries dependencies...)
 SIMGRID_DEP=""
 GRAS_DEP=""
 
+if test xpthread=xyes ; then 
+  # if the pthreads are usable
+  if test "x$with_context" = "xpthread" ; then
+    # if we use them to implement the xbt_context
+    SIMGRID_DEP="-lpthread"
+  fi
+  # we need them in any case for the gras lib (which is multithreaded), but on windows (of course)
+  if test "x$with_context" != "xwindows" ; then
+    GRAS_DEP="-lpthread"
+  fi
+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
+  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!)
+  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
-  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)
+AM_CONDITIONAL(HAVE_GTNETS,test "x$gtnets" != xno)
 
-if test xpthread=xyes ; then 
-  # if the pthreads are usable
-  if test "x$with_context" = "xpthread" ; then
-    # if we use them to implement the xbt_context
-    SIMGRID_DEP="-lpthread"
-  fi
-  # we need them in any case for the gras lib (which is multithreaded), but on windows (of course)
-  if test "x$with_context" = "xwindows" ; then
-    GRAS_DEP="-lpthread"
+#########################################
+## 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
-
-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;
 AM_CONDITIONAL(HAVE_SDP,test x$csdp != xno)
 
 AC_SUBST([SIMGRID_DEP])
@@ -243,7 +285,7 @@ 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
 	   
@@ -277,9 +319,10 @@ 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])
@@ -289,22 +332,31 @@ AC_SUBST([abs_top_srcdir])
 
 SG_CONFIGURE_PART(Check for Java bindings...)
 # Java cruft
-AC_PATH_PROG([JAVAC], [javac], `which javac`)
-AC_PATH_PROG([JAVA],  [java] , `which java`)
-AC_PATH_PROG([JAR],   [jar]  , `which jar`)
-AC_CHECK_HEADERS(jni.h)
-AC_MSG_CHECKING(whether to compile java bindings)
-if test -n "$JAVAC"   \
-   && test -n "$JAVA" \
-   && test -n "$JAR"  \
-   && test "x$ac_cv_header_jni_h"="xyes" ; then
+AC_ARG_ENABLE(java,
+	      AS_HELP_STRING([--disable-java], [To not compile the Java bindings even if the tools are found]),
+	      want_java=$enableval,want_java=yes)
+if test "x$want_java" != "xyes" ; then
+   AC_MSG_CHECKING(whether to compile java bindings)
+   AC_MSG_RESULT(disabled by user)
+   use_java="disabled by user"
+else
+  AC_PATH_PROG([JAVAC], [javac], `which javac`)
+  AC_PATH_PROG([JAVA],  [java] , `which java`)
+  AC_PATH_PROG([JAR],   [jar]  , `which jar`)
+  AC_CHECK_HEADERS(jni.h)
+  AC_MSG_CHECKING(whether to compile java bindings)
+  if test -n "$JAVAC"   \
+     && test -n "$JAVA" \
+     && test -n "$JAR"  \
+     && test "x$ac_cv_header_jni_h" = "xyes" ; then
    
-   use_java="yes"
-else   
-   use_java="no"
+     use_java="yes"
+  else   
+     use_java="no"
+  fi
+  AC_MSG_RESULT($use_java)
 fi
-AC_MSG_RESULT($use_java)
-AM_CONDITIONAL(HAVE_JAVA,test "x$use_java"="xyes")
+AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
 #####################
 ## Check for programs
@@ -423,16 +475,25 @@ AC_CONFIG_FILES([
 #      examples/gras/p2p/chord/Makefile
 #      examples/gras/p2p/can/Makefile
 
+if test "x$use_java" = "xyes" ; then
+AC_CONFIG_FILES([
+    examples/java/Makefile
+      examples/java/basic/Makefile
+      examples/java/comm_time/Makefile
+      examples/java/suspend/Makefile
+      examples/java/ping_pong/Makefile
+])
+fi
 
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
-      examples/msg/basic.tesh         examples/msg/small_plat.tesh 
-      examples/msg/suspend.tesh       examples/msg/flexml_bypass.tesh 
     examples/simdag/Makefile	    examples/simdag/test_simdag
     examples/gras/Makefile
       examples/gras/ping/Makefile   
       examples/gras/rpc/Makefile
+      examples/gras/spawn/Makefile
+      examples/gras/synchro/Makefile
       examples/gras/timer/Makefile
       examples/gras/chrono/Makefile
       examples/gras/mutual_exclusion/simple_token/Makefile
@@ -442,15 +503,9 @@ AC_CONFIG_FILES([
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
       examples/amok/saturate/Makefile  examples/amok/saturate/test_sg  examples/amok/saturate/test_rl
-    examples/java/Makefile
-      examples/java/basic/Makefile
-      examples/java/comm_time/Makefile
-      examples/java/suspend/Makefile
-      examples/java/ping_pong/Makefile
 ],[
     for file in                                                 \
      \
-     examples/msg/run_msg_test                                  \
      examples/simdag/test_simdag				\
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
      examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \