X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/145a798531c6dfbabfd82409a682e7cd14a39362..24f30a1f9d0c0c7b741d4c019ea3979d3d2e54e3:/configure diff --git a/configure b/configure index c991093e24..d78c046580 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.146 . +# From configure.ac Revision: 1.149 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for simgrid 3.2-cvs. +# Generated by GNU Autoconf 2.59 for simgrid 3.3-cvs. # # Report bugs to . # @@ -424,8 +424,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='simgrid' PACKAGE_TARNAME='simgrid' -PACKAGE_VERSION='3.2-cvs' -PACKAGE_STRING='simgrid 3.2-cvs' +PACKAGE_VERSION='3.3-cvs' +PACKAGE_STRING='simgrid 3.3-cvs' PACKAGE_BUGREPORT='simgrid-devel@lists.gforge.inria.fr' ac_unique_file="include/gras.h" @@ -955,7 +955,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures simgrid 3.2-cvs to adapt to many kinds of systems. +\`configure' configures simgrid 3.3-cvs to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1022,7 +1022,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of simgrid 3.2-cvs:";; + short | recursive ) echo "Configuration of simgrid 3.3-cvs:";; esac cat <<\_ACEOF @@ -1173,7 +1173,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -simgrid configure 3.2-cvs +simgrid configure 3.3-cvs generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1187,7 +1187,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by simgrid $as_me 3.2-cvs, which was +It was created by simgrid $as_me 3.3-cvs, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1925,7 +1925,7 @@ fi # Define the identity of the package. PACKAGE='simgrid' - VERSION='3.2-cvs' + VERSION='3.3-cvs' cat >>confdefs.h <<_ACEOF @@ -23625,7 +23625,7 @@ ucontext_t uc_main; void child(void *arg) { - if (arg != (void *)2147483648) + if (arg != (void *)12345) exit(1); if (swapcontext(&uc_child, &uc_main) != 0) exit(2); @@ -23651,7 +23651,7 @@ int main(int argc, char *argv[]) uc_child.uc_stack.ss_sp = (char *)stack+(32*1024); uc_child.uc_stack.ss_size = 32*1024; uc_child.uc_stack.ss_flags = 0; - makecontext(&uc_child, child, 2, (void *)2147483648); + makecontext(&uc_child, child, 2, (void *)12345); /* switch into the user context */ if (swapcontext(&uc_main, &uc_child) != 0) @@ -23971,6 +23971,7 @@ fi case $with_context in ucontext) ;; pthread) ;; + pthreads) ;; windows) ;; auto) with_context=ucontext;; *) { { echo "$as_me:$LINENO: error: --with-context must be either ucontext or pthread" >&5 @@ -24000,6 +24001,9 @@ echo "${ECHO_T}no working ucontext found. Try pthreads as a fallback" >&6 fi fi +if test "x$with_context" = "xpthreads"; then + with_context=pthread +fi if test "x$with_context" = "xpthread"; then for ac_header in pthread.h @@ -24690,74 +24694,16 @@ echo "${ECHO_T}${T_MD}Checking extra libraries dependencies...${T_ME}" >&6 SIMGRID_DEP="" GRAS_DEP="" -echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_create (); -int -main () -{ -pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pthread_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_pthread_pthread_create=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -if test $ac_cv_lib_pthread_pthread_create = yes; then - SIMGRID_DEP="-lpthread"; GRAS_DEP="-lpthread" +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) + GRAS_DEP="-lpthread" fi - echo "$as_me:$LINENO: checking for csdp" >&5 echo $ECHO_N "checking for csdp... $ECHO_C" >&6 sdp=no @@ -25755,7 +25701,7 @@ echo "${ECHO_T}${T_MD}Generating files...${T_ME}" >&6 # Tools being embeeded in gramine (stub generator) - ac_config_files="$ac_config_files tools/Makefile tools/gras/Makefile" + ac_config_files="$ac_config_files tools/Makefile tools/gras/Makefile tools/tesh/Makefile" @@ -26215,7 +26161,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by simgrid $as_me 3.2-cvs, which was +This file was extended by simgrid $as_me 3.3-cvs, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26278,7 +26224,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -simgrid config.status 3.2-cvs +simgrid config.status 3.3-cvs configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -26394,6 +26340,7 @@ do "src/ucontext_stack.h" ) CONFIG_FILES="$CONFIG_FILES src/ucontext_stack.h" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "tools/gras/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/gras/Makefile" ;; + "tools/tesh/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/tesh/Makefile" ;; "tools/graspe-slave" ) CONFIG_FILES="$CONFIG_FILES tools/graspe-slave" ;; "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "testsuite/run_tests" ) CONFIG_FILES="$CONFIG_FILES testsuite/run_tests" ;;