##
AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.3-svn],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.3.2-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_REVISION($Revision$)
+AC_REVISION($Revision: 6267 $)
AC_CANONICAL_TARGET
AC_LANG([C])
AC_PROG_CXX
###############
## SVN version check
##
-if test -e .svn ; then
+if test -e .svn && cat $VERSION | grep -q svn; then
VERSION="$VERSION-r`svnversion`"
PACKAGE_VERSION="$PACKAGE_VERSION-r`svnversion`"
PACKAGE_STRING="PACKAGE_STRING r`svnversion`"
GRAS_DEP="-lpthread"
fi
fi
+AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris
#########################################
## Build optional modules (gtnets)
AC_PATH_PROG([JAVA], [java] , `which java`)
AC_PATH_PROG([JAR], [jar] , `which jar`)
AC_CHECK_HEADERS(jni.h)
- if test -n "$JAVAC" -a test -n "$JAVA" -a test -n "$JAR" -a 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
AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND)
AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
-if test x$USE_MAINTAINER_MODE = xyes
-then
- # 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
-fi
+# Check for doxygen when in maintainer mode which is helpful to build doc & dist
+AC_PATH_PROG(DOXYGEN,doxygen,`which doxygen`)
+AM_CONDITIONAL(HAVE_DOXYGEN,test x$DOXYGEN != x)
# Can we extract really usable backtraces? (also need the popen function)
AC_PATH_PROG(ADDR2LINE, addr2line)
examples/gras/pmm/Makefile
examples/gras/all2all/Makefile
examples/amok/Makefile
+ examples/smpi/Makefile
])
AC_CONFIG_FILES([
src/smpi/smpicc
src/smpi/smpirun
+],[
+ for file in \
+ src/smpi/smpicc \
+ src/smpi/smpirun \
+ ; do \
+ test -e $file && chmod +x $file; \
+ done
])
# GRAMINE_CUT_END