typo

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 99579b9..c6562d6 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


@@ -259,6 +259,7 @@ if test xpthread=xyes ; then
     GRAS_DEP="-lpthread"
   fi
 fi
     GRAS_DEP="-lpthread"
   fi
 fi

+AC_SEARCH_LIBS([connect],[socket],[],[],[]) # need -lsocket on solaris

 
 #########################################
 ## Build optional modules (gtnets)
 
 #########################################
 ## Build optional modules (gtnets)


@@ -423,7 +424,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" -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   
      use_java="yes"
      AC_DEFINE(HAVE_JAVA,1, [defines whether Java bindings must be compiled or not])
   else   


@@ -455,15 +456,9 @@ AC_PROG_FLEX(2.5.30)
 AC_CHECK_PROG(FLEXML,flexml,`which flexml`,NOTFOUND)
 AM_CONDITIONAL(HAVE_FLEXML,test x$FLEXML != xNOTFOUND)
 
 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)
 
 # Can we extract really usable backtraces? (also need the popen function)
 AC_PATH_PROG(ADDR2LINE, addr2line)