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 not require doxygen in maintainer mode
[simgrid.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
7490971
..
801af8c
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-9,12
+9,12
@@
dnl GNU LGPL (v2.1) licence.
##
AC_PREREQ(2.59)
##
AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.
3
-svn],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.
4
-svn],[simgrid-devel@lists.gforge.inria.fr])
AC_CONFIG_SRCDIR([include/gras.h])
AC_CONFIG_HEADERS([src/gras_config.h])
# A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
AC_CONFIG_SRCDIR([include/gras.h])
AC_CONFIG_HEADERS([src/gras_config.h])
# A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
-AC_REVISION($Revision$)
+AC_REVISION($Revision
: 6267
$)
AC_CANONICAL_TARGET
AC_LANG([C])
AC_PROG_CXX
AC_CANONICAL_TARGET
AC_LANG([C])
AC_PROG_CXX
@@
-95,7
+95,7
@@
dnl ##
dnl ## CONTEXT IMPLEMENTATION
dnl ##
dnl ## CONTEXT IMPLEMENTATION
dnl ##
-SG_CONFIGURE_PART([Checking
for
threads, contexts or assimilated...])
+SG_CONFIGURE_PART([Checking threads, contexts or assimilated...])
dnl #
dnl # 1. determine possibilities
dnl #
dnl # 1. determine possibilities
@@
-306,7
+306,7
@@
AC_ARG_WITH(csdp,
csdp_path="$withval",csdp_path="no")
AC_MSG_CHECKING(for CSDP option:)
if test "x$csdp_path" = "xno" ; then
csdp_path="$withval",csdp_path="no")
AC_MSG_CHECKING(for CSDP option:)
if test "x$csdp_path" = "xno" ; then
- AC_MSG_RESULT(
no, eventually you will come to csdp.
)
+ AC_MSG_RESULT(
[no, 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)
else
AC_MSG_RESULT(***** You have decided to use csdp. Let's check whether it works or not *****)
AC_MSG_CHECKING(for csdp)
@@
-411,7
+411,7
@@
if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes
fi
fi
-SG_CONFIGURE_PART(Check
for
Java bindings...)
+SG_CONFIGURE_PART(Check
ing
Java bindings...)
# Java cruft
AC_ARG_ENABLE(java,
AS_HELP_STRING([--disable-java], [To not compile the Java bindings even if the tools are found]),
# Java cruft
AC_ARG_ENABLE(java,
AS_HELP_STRING([--disable-java], [To not compile the Java bindings even if the tools are found]),
@@
-423,11
+423,7
@@
else
AC_PATH_PROG([JAVA], [java] , `which java`)
AC_PATH_PROG([JAR], [jar] , `which jar`)
AC_CHECK_HEADERS(jni.h)
AC_PATH_PROG([JAVA], [java] , `which java`)
AC_PATH_PROG([JAR], [jar] , `which jar`)
AC_CHECK_HEADERS(jni.h)
- if test -n "$JAVAC" \
- && test -n "$JAVA" \
- && test -n "$JAR" \
- && test "x$ac_cv_header_jni_h" = "xyes" ; then
-
+ if test -n "$JAVAC" && test -n "$JAVA" && test -n "$JAR" && test "x$ac_cv_header_jni_h" = "xyes" ; then
use_java="yes"
AC_DEFINE(HAVE_JAVA,1, [defines whether Java bindings must be compiled or not])
else
use_java="yes"
AC_DEFINE(HAVE_JAVA,1, [defines whether Java bindings must be compiled or not])
else
@@
-442,7
+438,7
@@
AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
## Check for programs
##
## Check for programs
##
-SG_CONFIGURE_PART(Check
for
programs...)
+SG_CONFIGURE_PART(Check
ing
programs...)
AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
WARNING="This file is generated, do not edit"
AC_SUBST(WARNING)
AC_CHECK_PROG(BASH, bash, `which bash`, /bin/sh)
WARNING="This file is generated, do not edit"
AC_SUBST(WARNING)
@@
-464,9
+460,7
@@
then
# Check for doxygen when in maintainer mode since dist* targets fail
# without it
AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
# Check for doxygen when in maintainer mode since dist* targets fail
# without it
AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
- if test x$DOXYGEN = x ; then
- AC_MSG_ERROR([doxygen is mandatory in maintainer mode])
- fi
+ AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x)
fi
# Can we extract really usable backtraces? (also need the popen function)
fi
# Can we extract really usable backtraces? (also need the popen function)