A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do load portable.h explicitly since strbuff do not bogusly load it for us anymore
[simgrid.git]
/
configure
diff --git
a/configure
b/configure
index
84d2b58
..
6745285
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-1,7
+1,7
@@
#! /bin/sh
#! /bin/sh
-# From configure.ac Revision:
491
3 .
+# From configure.ac Revision:
505
3 .
# Guess values for system-dependent variables and create Makefiles.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for simgrid 3.3-
cvs
.
+# Generated by GNU Autoconf 2.61 for simgrid 3.3-
svn
.
#
# Report bugs to <simgrid-devel@lists.gforge.inria.fr>.
#
#
# Report bugs to <simgrid-devel@lists.gforge.inria.fr>.
#
@@
-731,8
+731,8
@@
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='simgrid'
PACKAGE_TARNAME='simgrid'
# Identity of this package.
PACKAGE_NAME='simgrid'
PACKAGE_TARNAME='simgrid'
-PACKAGE_VERSION='3.3-
cvs
'
-PACKAGE_STRING='simgrid 3.3-
cvs
'
+PACKAGE_VERSION='3.3-
svn
'
+PACKAGE_STRING='simgrid 3.3-
svn
'
PACKAGE_BUGREPORT='simgrid-devel@lists.gforge.inria.fr'
ac_unique_file="include/gras.h"
PACKAGE_BUGREPORT='simgrid-devel@lists.gforge.inria.fr'
ac_unique_file="include/gras.h"
@@
-1447,7
+1447,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
# 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.3-
cvs
to adapt to many kinds of systems.
+\`configure' configures simgrid 3.3-
svn
to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Usage: $0 [OPTION]... [VAR=VALUE]...
@@
-1518,7
+1518,7
@@
fi
if test -n "$ac_init_help"; then
case $ac_init_help in
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of simgrid 3.3-
cvs
:";;
+ short | recursive ) echo "Configuration of simgrid 3.3-
svn
:";;
esac
cat <<\_ACEOF
esac
cat <<\_ACEOF
@@
-1636,7
+1636,7
@@
fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-simgrid configure 3.3-
cvs
+simgrid configure 3.3-
svn
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@
-1650,7
+1650,7
@@
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
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.3-
cvs
, which was
+It was created by simgrid $as_me 3.3-
svn
, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@
-2702,7
+2702,7
@@
fi
# Define the identity of the package.
PACKAGE='simgrid'
# Define the identity of the package.
PACKAGE='simgrid'
- VERSION='3.3-
cvs
'
+ VERSION='3.3-
svn
'
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<_ACEOF
@@
-19445,6
+19445,15
@@
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+###############
+## SVN version check
+##
+if test -e .svn ; then
+ VERSION="$VERSION-r`svnversion`"
+ PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
+ PACKAGE_STRING="PACKAGE_STRING r`svnversion`"
+fi
###############
## System checks
###############
## System checks
@@
-26185,8
+26194,6
@@
else
disable_java=yes
fi
disable_java=yes
fi
-{ echo "$as_me:$LINENO: checking whether to compile java bindings" >&5
-echo $ECHO_N "checking whether to compile java bindings... $ECHO_C" >&6; }
if test "x$disable_java" != "xyes" ; then
use_java="disabled by user"
else
if test "x$disable_java" != "xyes" ; then
use_java="disabled by user"
else
@@
-26464,12
+26471,17
@@
done
&& test "x$ac_cv_header_jni_h" = "xyes" ; then
use_java="yes"
&& test "x$ac_cv_header_jni_h" = "xyes" ; then
use_java="yes"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_JAVA 1
+_ACEOF
+
else
use_java="no"
fi
fi
else
use_java="no"
fi
fi
-{ echo "$as_me:$LINENO: result: $use_java" >&5
-echo "${ECHO_T}$use_java" >&6; }
+{ echo "$as_me:$LINENO: result:
decide whether to compile java bindings...
$use_java" >&5
+echo "${ECHO_T}
decide whether to compile java bindings...
$use_java" >&6; }
if test "x$use_java" = "xyes"; then
HAVE_JAVA_TRUE=
HAVE_JAVA_FALSE='#'
if test "x$use_java" = "xyes"; then
HAVE_JAVA_TRUE=
HAVE_JAVA_FALSE='#'
@@
-26479,6
+26491,7
@@
else
fi
fi
+
#####################
## Check for programs
##
#####################
## Check for programs
##
@@
-26965,7
+26978,7
@@
fi
if test x$MD5SUM != xno ; then
if test x$MD5SUM != xno ; then
- build_version=`find -name '*.ch' |grep -v src/ucontext_stack.h | grep -v src/gras_config.h |\
+ build_version=`find
.
-name '*.ch' |grep -v src/ucontext_stack.h | grep -v src/gras_config.h |\
xargs cat| $MD5SUM | sed 's/ .*$//'`
else
build_version="no_md5sum_binary"
xargs cat| $MD5SUM | sed 's/ .*$//'`
else
build_version="no_md5sum_binary"
@@
-27027,7
+27040,7
@@
ac_config_files="$ac_config_files doc/Makefile doc/Doxyfile"
ac_config_files="$ac_config_files examples/java/Makefile examples/java/basic/Makefile examples/java/comm_time/Makefile examples/java/suspend/Makefile examples/java/ping_pong/Makefile"
ac_config_files="$ac_config_files examples/java/Makefile examples/java/basic/Makefile examples/java/comm_time/Makefile examples/java/suspend/Makefile examples/java/ping_pong/Makefile"
-ac_config_files="$ac_config_files examples/Makefile examples/msg/Makefile examples/simdag/Makefile 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 examples/gras/mmrpc/Makefile examples/gras/pmm/Makefile examples/gras/all2all/Makefile examples/amok/Makefile"
+ac_config_files="$ac_config_files examples/Makefile examples/msg/Makefile examples/simdag/Makefile 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/
properties/Makefile examples/gras/
chrono/Makefile examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mmrpc/Makefile examples/gras/pmm/Makefile examples/gras/all2all/Makefile examples/amok/Makefile"
ac_config_files="$ac_config_files src/smpi/smpicc src/smpi/smpirun"
ac_config_files="$ac_config_files src/smpi/smpicc src/smpi/smpirun"
@@
-27536,7
+27549,7
@@
exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by simgrid $as_me 3.3-
cvs
, which was
+This file was extended by simgrid $as_me 3.3-
svn
, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@
-27589,7
+27602,7
@@
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-simgrid config.status 3.3-
cvs
+simgrid config.status 3.3-
svn
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@
-27732,6
+27745,7
@@
do
"examples/gras/spawn/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/spawn/Makefile" ;;
"examples/gras/synchro/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/synchro/Makefile" ;;
"examples/gras/timer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/timer/Makefile" ;;
"examples/gras/spawn/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/spawn/Makefile" ;;
"examples/gras/synchro/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/synchro/Makefile" ;;
"examples/gras/timer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/timer/Makefile" ;;
+ "examples/gras/properties/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/properties/Makefile" ;;
"examples/gras/chrono/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/chrono/Makefile" ;;
"examples/gras/mutual_exclusion/simple_token/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/mutual_exclusion/simple_token/Makefile" ;;
"examples/gras/mmrpc/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/mmrpc/Makefile" ;;
"examples/gras/chrono/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/chrono/Makefile" ;;
"examples/gras/mutual_exclusion/simple_token/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/mutual_exclusion/simple_token/Makefile" ;;
"examples/gras/mmrpc/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/mmrpc/Makefile" ;;