Circumvent what seems to be a bug in recent libtools (circular dependency of AC_LANG_...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 85e5dc3..7490971 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ AC_CONFIG_HEADERS([src/gras_config.h])
 AC_REVISION($Revision$)
 AC_CANONICAL_TARGET
 AC_LANG([C])
+AC_PROG_CXX
 AM_PROG_GCJ
 
 AM_INIT_AUTOMAKE([gnu -Wno-portability])
@@ -199,6 +200,7 @@ if test "x$with_context" = "xucontext" ; then
   if test ".$mcsc" = .yes; then
     AC_MSG_RESULT(found working ucontext. Great!)
     AC_DEFINE([CONTEXT_UCONTEXT],1,[Define if xbt contexts are based on ucontext or not])
+    AC_CHECK_HEADERS([valgrind/valgrind.h])
   else
     if test ".$windows_context" = .yes ; then
       AC_MSG_RESULT(use windows context portability layer.)
@@ -270,8 +272,6 @@ if test "x$gtnets_path" = "xno" ; then
 else  
   AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. *****)
   AC_MSG_CHECKING(for gtnets)
-  AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support])
-  AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno")
   AC_LANG_PUSH([C++])  
   GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib"
   GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
@@ -288,10 +288,11 @@ fi
 
 if test "x$gtnets" = "xyes" ; then
   AC_MSG_RESULT(Enabling GTNETS support.)
+  AC_DEFINE([HAVE_GTNETS], 1, [Indicates that we have GTNETS support])
   LDFLAGS+="-lgtnets -L$gtnets_path/lib"
-  CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets -DHAVE_GTNETS"
+  CPPFLAGS+="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
 fi
-
+AM_CONDITIONAL(HAVE_GTNETS, test "x$gtnets" != "xno")
 
 
 
@@ -327,7 +328,7 @@ else
      csdp=no;
   fi
   if test "x$csdp" = xyes; then 
-    AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS -DHAVE_SDP"
+    AM_CPPFLAGS="$AM_CPPFLAGS $CSDP_CPPFLAGS"
     SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS"
     AC_MSG_RESULT(Found working sdp library.)
     AC_DEFINE([HAVE_SDP], 1, [Indicates whether we have the CSDP library or not])
@@ -507,6 +508,7 @@ AC_CONFIG_FILES([
     tools/gras/Makefile
     tools/tesh/Makefile
 ])
+#    tools/tesh2/Makefile
 
 
 # GRAMINE_CUT_BEGIN