From: alegrand Date: Thu, 2 Aug 2007 12:54:18 +0000 (+0000) Subject: Automatically generated files. X-Git-Tag: v3.3~1420 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/444ec96fae3799e0a6ec931c17a66a409ad409af Automatically generated files. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3940 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/Makefile.in b/Makefile.in index 58796c6eff..79e5a69cc5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -124,8 +124,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -700,10 +698,10 @@ gramine: @MAINTAINER_MODE_TRUE@release: distcheck remote debian publish @MAINTAINER_MODE_TRUE@debian: dist -@MAINTAINER_MODE_TRUE@ make -C ~/CVSIMPORT/pkg-grid/gras maintainerclean +@MAINTAINER_MODE_TRUE@ $(MAKE) -C ~/CVSIMPORT/pkg-grid/gras maintainerclean @MAINTAINER_MODE_TRUE@ cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/ @MAINTAINER_MODE_TRUE@ cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/@PACKAGE@_@VERSION@.orig.tar.gz -@MAINTAINER_MODE_TRUE@ make -C ~/CVSIMPORT/pkg-grid/gras deb check +@MAINTAINER_MODE_TRUE@ $(MAKE) -C ~/CVSIMPORT/pkg-grid/gras deb check @MAINTAINER_MODE_TRUE@ dput local *.changes @MAINTAINER_MODE_TRUE@publish-old: dist @@ -714,7 +712,7 @@ gramine: @MAINTAINER_MODE_TRUE@ @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----" @MAINTAINER_MODE_TRUE@ cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/gras/dl @MAINTAINER_MODE_TRUE@ @echo "----[ Sync remote host ]----" -@MAINTAINER_MODE_TRUE@ make -C public_html publish +@MAINTAINER_MODE_TRUE@ $(MAKE) -C public_html publish @MAINTAINER_MODE_TRUE@publish: dist @MAINTAINER_MODE_TRUE@ @echo "----[ Put the tarball @VERSION@ on gforge ]----" @@ -726,7 +724,7 @@ gramine: @MAINTAINER_MODE_TRUE@ cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/simgrid2 @MAINTAINER_MODE_TRUE@ cp -r doc/html ~/public_html/simgrid2/doc/ @MAINTAINER_MODE_TRUE@ cp ChangeLog ~/public_html/simgrid2/ -@MAINTAINER_MODE_TRUE@ make -C ~/public_html +@MAINTAINER_MODE_TRUE@ $(MAKE) -C ~/public_html @MAINTAINER_MODE_TRUE@sync-gforge: @MAINTAINER_MODE_TRUE@ rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times \ @@ -755,10 +753,10 @@ gramine: @MAINTAINER_MODE_TRUE@ simgrid-user@lists.gforge.inria.fr @MAINTAINER_MODE_TRUE@TAGS: -@MAINTAINER_MODE_TRUE@ etags -o ./TAGS `make dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` +@MAINTAINER_MODE_TRUE@ etags -o ./TAGS `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` @MAINTAINER_MODE_TRUE@splint: -@MAINTAINER_MODE_TRUE@ splint `make dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \ +@MAINTAINER_MODE_TRUE@ splint `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \ @MAINTAINER_MODE_TRUE@ +matchanyintegral -warnposix +boolint \ @MAINTAINER_MODE_TRUE@ +show-summary +stats\ @MAINTAINER_MODE_TRUE@ -Iinclude -Isrc/include -Isrc/base -Isrc diff --git a/configure b/configure index 4e0c1ecd29..ae30ee8327 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.172 . +# From configure.ac Revision: 1.175 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for simgrid 3.3-cvs. # @@ -888,10 +888,8 @@ GRAS_ARCH_32_BITS_FALSE PTH_STACK_GROWTH pth_skaddr_makecontext pth_sksize_makecontext -GTNETS_CFLAGS -GTNETS_LDFLAGS -USE_GTNETS_TRUE -USE_GTNETS_FALSE +HAVE_GTNETS_TRUE +HAVE_GTNETS_FALSE HAVE_SDP_TRUE HAVE_SDP_FALSE SIMGRID_DEP @@ -1550,6 +1548,8 @@ Optional Packages: --with-context=ucontext/pthread Use either (System V) swapcontext or pthread [default=auto]. --with-gtnets Path to GTNetS installation (default to empty, ie not using GTNetS) + --with-csdp Path to csdp installation (default to empty, i.e. + not using csdp) Some influential environment variables: CC C compiler command @@ -25254,70 +25254,159 @@ echo "${ECHO_T}${T_MD}Checking extra libraries dependencies...${T_ME}" >&6; } 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 # Check whether --with-gtnets was given. if test "${with_gtnets+set}" = set; then withval=$with_gtnets; gtnets_path="$withval" else - gtnets_path="NO" + gtnets_path="no" fi -if test "x$gtnets_path" = "xNO" ; then +if test "x$gtnets_path" = "xno" ; then { echo "$as_me:$LINENO: result: Eventually you will come to GTNetS." >&5 echo "${ECHO_T}Eventually you will come to GTNetS." >&6; } else - { echo "$as_me:$LINENO: result: ***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****" >&5 -echo "${ECHO_T}***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****" >&6; } + { echo "$as_me:$LINENO: result: ***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****" >&5 +echo "${ECHO_T}***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****" >&6; } + { echo "$as_me:$LINENO: checking for gtnets" >&5 +echo $ECHO_N "checking for gtnets... $ECHO_C" >&6; } + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -cat >>confdefs.h <<\_ACEOF -#define USE_GTNETS 1 + 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 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + #include - if ! test -e $gtnets_path ; then - { { echo "$as_me:$LINENO: error: Provided path to GTNetS include files ($gtnets_path) do not exist!" >&5 -echo "$as_me: error: Provided path to GTNetS include files ($gtnets_path) do not exist!" >&2;} - { (exit 1); exit 1; }; } - fi - GTNETS_CFLAGS=-I$gtnets_path/include +int +main () +{ +Simulator s; s.RunUntilNextCompletion(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gtnets=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - GTNETS_LDFLAGS=-L$gtnets_path/lib + gtnets=no +fi - SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS -lgtnets" +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$CPPFLAGS_SAV + LDFLAGS=$LDFLAGS_SAV + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + if test "x$gtnets" = xyes ; then + CPPFLAGS+=$GTNETS_CPPFLAGS + LDFLAGS+=$GTNETS_LDFLAGS + SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS" + { echo "$as_me:$LINENO: result: Found working gtnets library." >&5 +echo "${ECHO_T}Found working gtnets library." >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GTNETS 1 +_ACEOF + + else + { echo "$as_me:$LINENO: result: Could not find any working gtnets library or not patched version" >&5 +echo "${ECHO_T}Could not find any working gtnets library or not patched version" >&6; } + fi fi - if test "x$gtnets_path" != xNO; then - USE_GTNETS_TRUE= - USE_GTNETS_FALSE='#' + if test "x$gtnets" != xno; then + HAVE_GTNETS_TRUE= + HAVE_GTNETS_FALSE='#' else - USE_GTNETS_TRUE='#' - USE_GTNETS_FALSE= + HAVE_GTNETS_TRUE='#' + HAVE_GTNETS_FALSE= fi -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 +######################################### +## Build optional modules (csdp) +## +csdp=no + +# Check whether --with-csdp was given. +if test "${with_csdp+set}" = set; then + withval=$with_csdp; csdp_path="$withval" +else + csdp_path="no" fi -{ echo "$as_me:$LINENO: checking for csdp" >&5 +if test "x$csdp_path" = "xno" ; then + { echo "$as_me:$LINENO: result: Eventually you will come to csdp." >&5 +echo "${ECHO_T}Eventually you will come to csdp." >&6; } +else + { echo "$as_me:$LINENO: result: ***** You have decided to use csdp. Let's check whether it works or not *****" >&5 +echo "${ECHO_T}***** You have decided to use csdp. Let's check whether it works or not *****" >&6; } + { echo "$as_me:$LINENO: checking for csdp" >&5 echo $ECHO_N "checking for csdp... $ECHO_C" >&6; } -sdp=no -{ echo "$as_me:$LINENO: checking for sdp in -lsdp" >&5 -echo $ECHO_N "checking for sdp in -lsdp... $ECHO_C" >&6; } -if test "${ac_cv_lib_sdp_sdp+set}" = set; then + CSDP_LDFLAGS="-L$csdp_path/lib -lsdp -llapack -lblas -lm" + CSDP_CPPFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp" + + { echo "$as_me:$LINENO: checking for easy_sdp in -lsdp" >&5 +echo $ECHO_N "checking for easy_sdp in -lsdp... $ECHO_C" >&6; } +if test "${ac_cv_lib_sdp_easy_sdp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsdp -llapack -lblas -lm $LIBS" +LIBS="-lsdp $CSDP_LDFLAGS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25331,11 +25420,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char sdp (); +char easy_sdp (); int main () { -return sdp (); +return easy_sdp (); ; return 0; } @@ -25358,39 +25447,190 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_sdp_sdp=yes + ac_cv_lib_sdp_easy_sdp=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_sdp_sdp=no + ac_cv_lib_sdp_easy_sdp=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp" >&5 -echo "${ECHO_T}$ac_cv_lib_sdp_sdp" >&6; } -if test $ac_cv_lib_sdp_sdp = yes; then - csdp=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_easy_sdp" >&5 +echo "${ECHO_T}$ac_cv_lib_sdp_easy_sdp" >&6; } +if test $ac_cv_lib_sdp_easy_sdp = yes; then + csdp_lib=yes else - csdp=no + csdp_lib=no fi -if test "x$csdp" = xyes; then - SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm" - { echo "$as_me:$LINENO: result: Found working sdp library." >&5 + + CPPFLAGS_SAV=$CPPFLAGS + CPPFLAGS+=$CSDP_CPPFLAGS + if test "${ac_cv_header_declarations_h+set}" = set; then + { echo "$as_me:$LINENO: checking for declarations.h" >&5 +echo $ECHO_N "checking for declarations.h... $ECHO_C" >&6; } +if test "${ac_cv_header_declarations_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_declarations_h" >&5 +echo "${ECHO_T}$ac_cv_header_declarations_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking declarations.h usability" >&5 +echo $ECHO_N "checking declarations.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking declarations.h presence" >&5 +echo $ECHO_N "checking declarations.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: declarations.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: declarations.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: declarations.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: declarations.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: declarations.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: declarations.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: declarations.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: declarations.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: declarations.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: declarations.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: declarations.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: declarations.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: declarations.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: declarations.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: declarations.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: declarations.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------------------------- ## +## Report this to simgrid-devel@lists.gforge.inria.fr ## +## -------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for declarations.h" >&5 +echo $ECHO_N "checking for declarations.h... $ECHO_C" >&6; } +if test "${ac_cv_header_declarations_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_declarations_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_declarations_h" >&5 +echo "${ECHO_T}$ac_cv_header_declarations_h" >&6; } + +fi +if test $ac_cv_header_declarations_h = yes; then + csdp_header=yes +else + csdp_header=no +fi + + + 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 + CPPFLAGS+=$CSDP_CPPFLAGS + SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS" + { echo "$as_me:$LINENO: result: Found working sdp library." >&5 echo "${ECHO_T}Found working sdp library." >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_SDP 1 _ACEOF -else - { echo "$as_me:$LINENO: result: Could not find any working sdp library." >&5 + else + { echo "$as_me:$LINENO: result: Could not find any working sdp library." >&5 echo "${ECHO_T}Could not find any working sdp library." >&6; } -fi; + fi; +fi if test x$csdp != xno; then HAVE_SDP_TRUE= HAVE_SDP_FALSE='#' @@ -25682,9 +25922,10 @@ echo $ECHO_N "checking the optimization flags for this compiler... $ECHO_C" >&6; GCC_VER=`gcc --version | head -n 1 | sed 's/^^0-9*\(^ *\).*$/\1/'` GCC_VER_MAJ=`echo $GCC_VER | sed 's/^\(.\).*$/\1/'` - if test "x$target_cpu" = "xpowerpc" && test "x$GCC_VER_MAJ" != "x2" ; then - # avoid gcc bug #12828, which is fixed in 3.4.0, but this version - # isn't propagated enough to desserve an extra check + if test "x$target_cpu" = "xpowerpc" && test "x$GCC_VER_MAJ" == "x3" ; then + # avoid gcc bug #12828, which apeared in 3.x branch and is fixed in 3.4.0 + # but the check would be too complicated to get 3.4. + # Instead, rule out any 3.x compiler. # Note that the flag didn't exist before gcc 3.0 optCFLAGS="$optCFLAGS -fno-loop-optimize" @@ -26719,10 +26960,10 @@ echo "$as_me: error: conditional \"GRAS_ARCH_32_BITS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${USE_GTNETS_TRUE}" && test -z "${USE_GTNETS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"USE_GTNETS\" was never defined. +if test -z "${HAVE_GTNETS_TRUE}" && test -z "${HAVE_GTNETS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTNETS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"USE_GTNETS\" was never defined. +echo "$as_me: error: conditional \"HAVE_GTNETS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -27490,10 +27731,8 @@ GRAS_ARCH_32_BITS_FALSE!$GRAS_ARCH_32_BITS_FALSE$ac_delim PTH_STACK_GROWTH!$PTH_STACK_GROWTH$ac_delim pth_skaddr_makecontext!$pth_skaddr_makecontext$ac_delim pth_sksize_makecontext!$pth_sksize_makecontext$ac_delim -GTNETS_CFLAGS!$GTNETS_CFLAGS$ac_delim -GTNETS_LDFLAGS!$GTNETS_LDFLAGS$ac_delim -USE_GTNETS_TRUE!$USE_GTNETS_TRUE$ac_delim -USE_GTNETS_FALSE!$USE_GTNETS_FALSE$ac_delim +HAVE_GTNETS_TRUE!$HAVE_GTNETS_TRUE$ac_delim +HAVE_GTNETS_FALSE!$HAVE_GTNETS_FALSE$ac_delim HAVE_SDP_TRUE!$HAVE_SDP_TRUE$ac_delim HAVE_SDP_FALSE!$HAVE_SDP_FALSE$ac_delim SIMGRID_DEP!$SIMGRID_DEP$ac_delim @@ -27530,7 +27769,7 @@ build_id!$build_id$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/doc/Makefile.in b/doc/Makefile.in index ccbf48226a..d2f5ab822b 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -94,8 +94,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/Makefile.in b/examples/Makefile.in index 70f53d883a..8e883db435 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -107,8 +107,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/amok/Makefile.in b/examples/amok/Makefile.in index e8d9434ede..3876b113b1 100644 --- a/examples/amok/Makefile.in +++ b/examples/amok/Makefile.in @@ -106,8 +106,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/amok/bandwidth/Makefile.in b/examples/amok/bandwidth/Makefile.in index ba9d9ccf6c..343c5fa611 100644 --- a/examples/amok/bandwidth/Makefile.in +++ b/examples/amok/bandwidth/Makefile.in @@ -128,8 +128,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/amok/saturate/Makefile.in b/examples/amok/saturate/Makefile.in index 521813238e..2e01dfce2f 100644 --- a/examples/amok/saturate/Makefile.in +++ b/examples/amok/saturate/Makefile.in @@ -128,8 +128,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/Makefile.in b/examples/gras/Makefile.in index 393ffab341..5d20896024 100644 --- a/examples/gras/Makefile.in +++ b/examples/gras/Makefile.in @@ -106,8 +106,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/all2all/Makefile.in b/examples/gras/all2all/Makefile.in index c205f0329f..5c9c0f6212 100644 --- a/examples/gras/all2all/Makefile.in +++ b/examples/gras/all2all/Makefile.in @@ -141,8 +141,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/chrono/Makefile.in b/examples/gras/chrono/Makefile.in index 8525081f57..3d84cb8f39 100644 --- a/examples/gras/chrono/Makefile.in +++ b/examples/gras/chrono/Makefile.in @@ -135,8 +135,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/mmrpc/Makefile.in b/examples/gras/mmrpc/Makefile.in index b4ed9fc626..292a667f39 100644 --- a/examples/gras/mmrpc/Makefile.in +++ b/examples/gras/mmrpc/Makefile.in @@ -142,8 +142,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/mutual_exclusion/simple_token/Makefile.in b/examples/gras/mutual_exclusion/simple_token/Makefile.in index c894173554..75f9cb1f0c 100644 --- a/examples/gras/mutual_exclusion/simple_token/Makefile.in +++ b/examples/gras/mutual_exclusion/simple_token/Makefile.in @@ -138,8 +138,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/ping/Makefile.in b/examples/gras/ping/Makefile.in index cba3971aca..c721821255 100644 --- a/examples/gras/ping/Makefile.in +++ b/examples/gras/ping/Makefile.in @@ -142,8 +142,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/pmm/Makefile.in b/examples/gras/pmm/Makefile.in index 635ecaf068..bc68b4ac02 100644 --- a/examples/gras/pmm/Makefile.in +++ b/examples/gras/pmm/Makefile.in @@ -138,8 +138,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/rpc/Makefile.in b/examples/gras/rpc/Makefile.in index 080e227099..122d304397 100644 --- a/examples/gras/rpc/Makefile.in +++ b/examples/gras/rpc/Makefile.in @@ -141,8 +141,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/spawn/Makefile.in b/examples/gras/spawn/Makefile.in index 1a0b4e83f0..67347dfe72 100644 --- a/examples/gras/spawn/Makefile.in +++ b/examples/gras/spawn/Makefile.in @@ -142,8 +142,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/synchro/Makefile.in b/examples/gras/synchro/Makefile.in index 9328736679..74a295fa47 100644 --- a/examples/gras/synchro/Makefile.in +++ b/examples/gras/synchro/Makefile.in @@ -135,8 +135,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/gras/timer/Makefile.in b/examples/gras/timer/Makefile.in index 4d794ff582..8cace1ba95 100644 --- a/examples/gras/timer/Makefile.in +++ b/examples/gras/timer/Makefile.in @@ -133,8 +133,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/java/Makefile.in b/examples/java/Makefile.in index 0908302a39..49e448dbcd 100644 --- a/examples/java/Makefile.in +++ b/examples/java/Makefile.in @@ -106,8 +106,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in index 70a52375d6..1eea6790a8 100644 --- a/examples/java/basic/Makefile.in +++ b/examples/java/basic/Makefile.in @@ -99,8 +99,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in index 17fc1bf198..b08a27ef2e 100644 --- a/examples/java/comm_time/Makefile.in +++ b/examples/java/comm_time/Makefile.in @@ -99,8 +99,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/java/ping_pong/Makefile.in b/examples/java/ping_pong/Makefile.in index a0196a50f0..12d719a165 100644 --- a/examples/java/ping_pong/Makefile.in +++ b/examples/java/ping_pong/Makefile.in @@ -99,8 +99,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/java/suspend/Makefile.in b/examples/java/suspend/Makefile.in index 2109429706..5145d9a353 100644 --- a/examples/java/suspend/Makefile.in +++ b/examples/java/suspend/Makefile.in @@ -99,8 +99,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/examples/msg/Makefile.in b/examples/msg/Makefile.in index 8667ecd204..4445f03e9b 100644 --- a/examples/msg/Makefile.in +++ b/examples/msg/Makefile.in @@ -39,9 +39,12 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @HAVE_SDP_TRUE@am__append_1 = sendrecv/sendrecv_KCCFLN05_proportional.tesh +@HAVE_GTNETS_TRUE@am__append_2 = gtnets/gtnets bin_PROGRAMS = sendrecv/sendrecv$(EXEEXT) suspend/suspend$(EXEEXT) \ masterslave/masterslave$(EXEEXT) \ - masterslave/masterslave_forwarder$(EXEEXT) + masterslave/masterslave_forwarder$(EXEEXT) $(am__EXEEXT_1) +@HAVE_GTNETS_TRUE@am__append_3 = gtnets/gtnets +@HAVE_GTNETS_FALSE@am__append_4 = gtnets/gtnets.c DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/acmacro/dist-files.mk subdir = examples/msg @@ -59,15 +62,21 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/gras_config.h CONFIG_CLEAN_FILES = +@HAVE_GTNETS_TRUE@am__EXEEXT_1 = gtnets/gtnets$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) +am__gtnets_gtnets_SOURCES_DIST = gtnets/gtnets.c +@HAVE_GTNETS_TRUE@am_gtnets_gtnets_OBJECTS = gtnets.$(OBJEXT) +gtnets_gtnets_OBJECTS = $(am_gtnets_gtnets_OBJECTS) +@HAVE_GTNETS_TRUE@gtnets_gtnets_DEPENDENCIES = \ +@HAVE_GTNETS_TRUE@ $(top_builddir)/src/libsimgrid.la +am__dirstamp = $(am__leading_dot)dirstamp am_masterslave_masterslave_OBJECTS = masterslave.$(OBJEXT) masterslave_masterslave_OBJECTS = \ $(am_masterslave_masterslave_OBJECTS) masterslave_masterslave_DEPENDENCIES = \ $(top_builddir)/src/libsimgrid.la -am__dirstamp = $(am__leading_dot)dirstamp am_masterslave_masterslave_forwarder_OBJECTS = \ masterslave_forwarder.$(OBJEXT) masterslave_masterslave_forwarder_OBJECTS = \ @@ -92,10 +101,11 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(masterslave_masterslave_SOURCES) \ +SOURCES = $(gtnets_gtnets_SOURCES) $(masterslave_masterslave_SOURCES) \ $(masterslave_masterslave_forwarder_SOURCES) \ $(sendrecv_sendrecv_SOURCES) $(suspend_suspend_SOURCES) -DIST_SOURCES = $(masterslave_masterslave_SOURCES) \ +DIST_SOURCES = $(am__gtnets_gtnets_SOURCES_DIST) \ + $(masterslave_masterslave_SOURCES) \ $(masterslave_masterslave_forwarder_SOURCES) \ $(sendrecv_sendrecv_SOURCES) $(suspend_suspend_SOURCES) ETAGS = etags @@ -138,8 +148,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -238,24 +246,24 @@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir)/include -EXTRA_DIST = msg_platform.xml \ - sendrecv/platform_sendrecv.xml \ - sendrecv/deployment_sendrecv.xml - +EXTRA_DIST = msg_platform.xml small_platform.xml \ + sendrecv/platform_sendrecv.xml \ + sendrecv/deployment_sendrecv.xml \ + suspend/deployment_suspend.xml \ + masterslave/deployment_masterslave_forwarder.xml \ + masterslave/deployment_masterslave.xml \ + gtnets/r-n200-f50-s4-2-d.xml gtnets/onelink-p.xml \ + gtnets/onelink-d.xml gtnets/r-n200-f50-s4-2-p.xml \ + gtnets/dogbone-d.xml gtnets/dogbone-p.xml $(am__append_4) TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh TESTS = sendrecv/sendrecv_KCCFLN05.tesh $(am__append_1) \ sendrecv/sendrecv_KCCFLN05_Vegas.tesh \ sendrecv/sendrecv_KCCFLN05_Reno.tesh suspend/suspend.tesh \ masterslave/masterslave.tesh \ masterslave/masterslave_forwarder.tesh -CLEANFILES = sendrecv/*~ \ - sendrecv/sendrecv \ - suspend/*~ \ - suspend/suspend \ - masterslave/*~ \ - masterslave/masterslave \ - masterslave/masterslave_forwarder - +CLEANFILES = sendrecv/*~ sendrecv/sendrecv suspend/*~ suspend/suspend \ + masterslave/*~ masterslave/masterslave \ + masterslave/masterslave_forwarder $(am__append_2) # sendrecv simple example sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c @@ -272,6 +280,14 @@ masterslave_masterslave_LDADD = $(top_builddir)/src/libsimgrid.la # verify the communication time of a simple simulation masterslave_masterslave_forwarder_SOURCES = masterslave/masterslave_forwarder.c masterslave_masterslave_forwarder_LDADD = $(top_builddir)/src/libsimgrid.la + +# bypass the surf xml parser +#masterslave_masterslave_bypass_SOURCES = masterslave/masterslave_bypass.c +#masterslave_masterslave_bypass_LDADD = $(top_builddir)/src/libsimgrid.la + +# verify if the GTNETS feature is working +@HAVE_GTNETS_TRUE@gtnets_gtnets_SOURCES = gtnets/gtnets.c +@HAVE_GTNETS_TRUE@gtnets_gtnets_LDADD = $(top_builddir)/src/libsimgrid.la all: all-am .SUFFIXES: @@ -333,6 +349,12 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +gtnets/$(am__dirstamp): + @$(MKDIR_P) gtnets + @: > gtnets/$(am__dirstamp) +gtnets/gtnets$(EXEEXT): $(gtnets_gtnets_OBJECTS) $(gtnets_gtnets_DEPENDENCIES) gtnets/$(am__dirstamp) + @rm -f gtnets/gtnets$(EXEEXT) + $(LINK) $(gtnets_gtnets_OBJECTS) $(gtnets_gtnets_LDADD) $(LIBS) masterslave/$(am__dirstamp): @$(MKDIR_P) masterslave @: > masterslave/$(am__dirstamp) @@ -361,6 +383,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtnets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masterslave_forwarder.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendrecv.Po@am__quote@ @@ -387,6 +410,20 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +gtnets.o: gtnets/gtnets.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gtnets.o -MD -MP -MF $(DEPDIR)/gtnets.Tpo -c -o gtnets.o `test -f 'gtnets/gtnets.c' || echo '$(srcdir)/'`gtnets/gtnets.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gtnets.Tpo $(DEPDIR)/gtnets.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtnets/gtnets.c' object='gtnets.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gtnets.o `test -f 'gtnets/gtnets.c' || echo '$(srcdir)/'`gtnets/gtnets.c + +gtnets.obj: gtnets/gtnets.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gtnets.obj -MD -MP -MF $(DEPDIR)/gtnets.Tpo -c -o gtnets.obj `if test -f 'gtnets/gtnets.c'; then $(CYGPATH_W) 'gtnets/gtnets.c'; else $(CYGPATH_W) '$(srcdir)/gtnets/gtnets.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gtnets.Tpo $(DEPDIR)/gtnets.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtnets/gtnets.c' object='gtnets.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gtnets.obj `if test -f 'gtnets/gtnets.c'; then $(CYGPATH_W) 'gtnets/gtnets.c'; else $(CYGPATH_W) '$(srcdir)/gtnets/gtnets.c'; fi` + masterslave.o: masterslave/masterslave.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT masterslave.o -MD -MP -MF $(DEPDIR)/masterslave.Tpo -c -o masterslave.o `test -f 'masterslave/masterslave.c' || echo '$(srcdir)/'`masterslave/masterslave.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/masterslave.Tpo $(DEPDIR)/masterslave.Po @@ -625,6 +662,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f gtnets/$(am__dirstamp) -rm -f masterslave/$(am__dirstamp) -rm -f sendrecv/$(am__dirstamp) -rm -f suspend/$(am__dirstamp) @@ -714,10 +752,6 @@ dist-files: @for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done @echo @for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done - -# bypass the surf xml parser -#masterslave_masterslave_bypass_SOURCES = masterslave/masterslave_bypass.c -#masterslave_masterslave_bypass_LDADD = $(top_builddir)/src/libsimgrid.la # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/examples/simdag/Makefile.in b/examples/simdag/Makefile.in index e0e820e271..8d0ac9d226 100644 --- a/examples/simdag/Makefile.in +++ b/examples/simdag/Makefile.in @@ -112,8 +112,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/include/Makefile.in b/include/Makefile.in index ff178aed04..33ac44b82c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -108,8 +108,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/libtool b/libtool index e3a13c1d98..a33f84f4d6 100755 --- a/libtool +++ b/libtool @@ -44,7 +44,7 @@ available_tags=" CXX GCJ" # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host blaise: +# Libtool was configured on host kanza: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -97,13 +97,13 @@ with_gcc=yes EGREP="/bin/grep -E" # The linker used to build libraries. -LD="/usr/bin/ld" +LD="/usr/bin/X11//ld" # Whether we need hard or soft links. LN_S="ln -s" # A BSD-compatible nm program. -NM="/usr/bin/nm -B" +NM="/usr/bin/X11//nm -B" # A symbol stripping program STRIP="strip" @@ -328,7 +328,7 @@ link_all_deplibs=no sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../ /lib/i486-linux-gnu/4.1.3/ /lib/ /usr/lib/i486-linux-gnu/4.1.3/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu " +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 /usr/X11R6/lib64 /usr/lib/atlas/sse2 /usr/lib/sse2 /usr/lib/atlas /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/lib/R/lib " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7223,7 +7223,7 @@ disable_libs=static # End: # ### BEGIN LIBTOOL TAG CONFIG: CXX -# Libtool was configured on host blaise: +# Libtool was configured on host kanza: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7276,13 +7276,13 @@ with_gcc=yes EGREP="/bin/grep -E" # The linker used to build libraries. -LD="/usr/bin/ld" +LD="/usr/bin/X11//ld" # Whether we need hard or soft links. LN_S="ln -s" # A BSD-compatible nm program. -NM="/usr/bin/nm -B" +NM="/usr/bin/X11//nm -B" # A symbol stripping program STRIP="strip" @@ -7504,7 +7504,7 @@ link_all_deplibs=no sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../i486-linux-gnu/4.1.3/ /usr/lib/gcc/i486-linux-gnu/4.1.3/../../../ /lib/i486-linux-gnu/4.1.3/ /lib/ /usr/lib/i486-linux-gnu/4.1.3/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu " +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 /usr/X11R6/lib64 /usr/lib/atlas/sse2 /usr/lib/sse2 /usr/lib/atlas /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/lib/R/lib " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7528,7 +7528,7 @@ include_expsyms="" # ### BEGIN LIBTOOL TAG CONFIG: GCJ -# Libtool was configured on host blaise: +# Libtool was configured on host kanza: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7587,7 +7587,7 @@ LD="" LN_S="ln -s" # A BSD-compatible nm program. -NM="/usr/bin/nm -B" +NM="/usr/bin/X11//nm -B" # A symbol stripping program STRIP="strip" @@ -7812,7 +7812,7 @@ link_all_deplibs=no sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../ /lib/i486-linux-gnu/4.1.2/ /lib/ /usr/lib/i486-linux-gnu/4.1.2/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu " +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 /usr/X11R6/lib64 /usr/lib/atlas/sse2 /usr/lib/sse2 /usr/lib/atlas /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/lib/R/lib " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" diff --git a/src/Makefile.in b/src/Makefile.in index ad36bbd590..4c04bc968a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@USE_GTNETS_FALSE@am__append_1 = $(GTNETS_SRC) +@HAVE_GTNETS_FALSE@am__append_1 = $(GTNETS_SRC) @HAVE_SDP_FALSE@am__append_2 = surf/sdp.c @HAVE_JAVA_TRUE@am__append_3 = libsimgrid4java.la @HAVE_JAVA_FALSE@am__append_4 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) @@ -143,7 +143,7 @@ am__objects_6 = maxmin.lo lagrange.lo trace_mgr.lo surf.lo \ surf_timer.lo network_dassf.lo workstation_KCCFLN05.lo am__objects_7 = gtnets_simulator.lo gtnets_topology.lo \ gtnets_interface.lo network_gtnets.lo -@USE_GTNETS_TRUE@am__objects_8 = $(am__objects_7) +@HAVE_GTNETS_TRUE@am__objects_8 = $(am__objects_7) @HAVE_SDP_TRUE@am__objects_9 = sdp.lo am__objects_10 = smx_global.lo smx_deployment.lo smx_config.lo \ smx_environment.lo smx_host.lo smx_process.lo smx_action.lo \ @@ -269,7 +269,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADDR2LINE = @ADDR2LINE@ AMTAR = @AMTAR@ -AM_CFLAGS = @AM_CFLAGS@ -g @GTNETS_CFLAGS@ + +#AM_CPPFLAGS= +AM_CFLAGS = -g AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -303,8 +305,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -604,12 +604,12 @@ AMOK_SRC = \ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ amok/PeerManagement/peermanagement.c -@USE_GTNETS_FALSE@GTNETS_USED = +@HAVE_GTNETS_FALSE@GTNETS_USED = ############################## # Deal with optional modules # ############################## -@USE_GTNETS_TRUE@GTNETS_USED = $(GTNETS_SRC) +@HAVE_GTNETS_TRUE@GTNETS_USED = $(GTNETS_SRC) @HAVE_SDP_FALSE@SDP_SRC = @HAVE_SDP_TRUE@SDP_SRC = surf/sdp.c @@ -624,11 +624,11 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(MSG_SRC) $(SIMDAG_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm @HAVE_JAVA_TRUE@libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ @HAVE_JAVA_TRUE@ $(SIMIX_SRC) $(JCTX_SRC) \ @HAVE_JAVA_TRUE@ $(JMSG_C_SRC) $(MSG_SRC) \ -@HAVE_JAVA_TRUE@ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) +@HAVE_JAVA_TRUE@ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) @HAVE_JAVA_TRUE@libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm @HAVE_JAVA_TRUE@libsimgrid4java_la_GCJFLAGS = -fjni diff --git a/src/gras_config.h.in b/src/gras_config.h.in index 3ace03e26b..337d741a84 100644 --- a/src/gras_config.h.in +++ b/src/gras_config.h.in @@ -71,6 +71,9 @@ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY +/* Indicates whether we have the GTNETS library or not */ +#undef HAVE_GTNETS + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -198,9 +201,6 @@ /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME -/* Indicates whether we should use GTNetS or not */ -#undef USE_GTNETS - /* Version number of package */ #undef VERSION diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 1be204d474..7f12ced973 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -179,8 +179,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -330,7 +328,6 @@ xbt_context_usage_LDADD = $(LDADD_SG) surf_maxmin_usage_LDADD = $(LDADD_SG) surf_maxmin_bench_LDADD = $(LDADD_SG) surf_simeng_usage_LDADD = $(LDADD_SG) -surf_simeng_bench_LDADD = $(LDADD_SG) surf_trace_usage_LDADD = $(LDADD_SG) surf_surf_usage_LDADD = $(LDADD_SG) surf_surf_usage2_LDADD = $(LDADD_SG) diff --git a/tools/Makefile.in b/tools/Makefile.in index 59a85945b8..85d403d1c8 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -106,8 +106,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/tools/gras/Makefile.in b/tools/gras/Makefile.in index 669b26942c..9e183c47a3 100644 --- a/tools/gras/Makefile.in +++ b/tools/gras/Makefile.in @@ -117,8 +117,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/tools/tesh/Makefile.in b/tools/tesh/Makefile.in index 8cb4dbe078..423788d97e 100644 --- a/tools/tesh/Makefile.in +++ b/tools/tesh/Makefile.in @@ -117,8 +117,6 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GRAS_DEP = @GRAS_DEP@ GREP = @GREP@ -GTNETS_CFLAGS = @GTNETS_CFLAGS@ -GTNETS_LDFLAGS = @GTNETS_LDFLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@