do not declare these functions both private and public, since it mess this poor windo...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3007d75..f5f58f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl GNU LGPL (v2.1) licence.
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.3-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.3-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
@@ -31,6 +31,15 @@ dnl We do build a proper DLL when using win32
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_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
 ##
@@ -416,6 +425,7 @@ else
      && 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="no"
   fi
@@ -423,6 +433,7 @@ fi
 AC_MSG_RESULT(decide whether to compile java bindings... $use_java)
 AM_CONDITIONAL(HAVE_JAVA,test "x$use_java" = "xyes")
 
+
 #####################
 ## Check for programs
 ##
@@ -461,15 +472,10 @@ if test x$ADDR2LINE != x ; then
 fi
 
 AC_SUBST(ac_configure_args)
+AC_DEFINE_UNQUOTED(AC_CONFIGURE_ARGS,"$ac_configure_args",[Arguments passed to the configure script])
 # Can we make status line about the compilation result?
-AC_CHECK_PROG(MD5SUM,md5sum,`which md5sum`)
-if test x$MD5SUM != xno ; then
-  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"
-fi
-build_id="$PACKAGE ver=$VERSION build=$build_version args=\"$ac_configure_args\""
+dnl A C_CHECK_PROG(MD5SUM,md5sum,`which md5sum`)
+build_id="$PACKAGE ver=$VERSION args=\"$ac_configure_args\""
 AC_SUBST(build_id)
 
 ###################
@@ -489,7 +495,7 @@ AC_CONFIG_FILES([
   Makefile
   include/Makefile
   src/Makefile
-  src/ucontext_stack.h
+  src/context_sysv_config.h
 ])
 
 # Tools being embeeded in gramine (stub generator)
@@ -561,6 +567,7 @@ AC_CONFIG_FILES([
       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