X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc067af3e26dfddeff7391d403540118a2914dea..a2a1aee909cfa9076f9dbe34778140af74dfebd3:/configure.ac

diff --git a/configure.ac b/configure.ac
index 3f30fa18ab..da3f2c8199 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,7 +201,6 @@ if test xpthread=xyes ; then
   fi
 fi
 
-
 #########################################
 ## Build optional modules (gtnets)
 ##
@@ -212,23 +211,23 @@ AC_ARG_WITH(gtnets,
 if test "x$gtnets_path" = "xno" ; then
   AC_MSG_RESULT(Eventually you will come to GTNetS.)
 else  
-  AC_MSG_RESULT(***** You have decided to use the exp˜erimental GTNetS. We hope you know what you're doing.. *****)
+  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_LANG([C++])  
+  AC_LANG_PUSH([C++])  
+  GTNETS_LDFLAGS="-lgtnets -L$gtnets_path/lib"
+  GTNETS_CPPFLAGS="-I$gtnets_path/include -I$gtnets_path/include/gtnets"
   LDFLAGS_SAV=$LDFLAGS	
-  LDFLAGS+="-lgtnets -L$gtnets_path/lib"
-  AC_TRY_LINK([ class Simulator{
-                  public:
-                  double RunUntilNextCompletion();
-                };], [Simulator s; s.RunUntilNextCompletion();], gtnets=yes, gtnets=no)
+  CPPFLAGS_SAV=$CPPFLAGS
+  CPPFLAGS+=$GTNETS_CPPFLAGS
+  LDFLAGS+=$GTNETS_LDFLAGS
+  AC_TRY_LINK([ #include <simulator.h>
+              ], [Simulator s; s.RunUntilNextCompletion();], gtnets=yes, gtnets=no)
+  CPPFLAGS=$CPPFLAGS_SAV
   LDFLAGS=$LDFLAGS_SAV
-  AC_LANG(C)  
+  AC_LANG_POP([C++])  
 
   if test "x$gtnets" = xyes ; then 
-    GTNETS_CFLAGS=-I$gtnets_path/include
-    AC_SUBST([GTNETS_CFLAGS])  
-    GTNETS_LDFLAGS=-L$gtnets_path/lib
-    AC_SUBST([GTNETS_LDFLAGS])
+    AM_CPPFLAGS="$AM_CPPFLAGS $GTNETS_CPPFLAGS"
     SIMGRID_DEP="$SIMGRID_DEP $GTNETS_LDFLAGS"
     AC_MSG_RESULT(Found working gtnets library.)
     AC_DEFINE(HAVE_GTNETS, 1, [Indicates whether we have the GTNETS library or not])
@@ -250,13 +249,17 @@ if test "x$csdp_path" = "xno" ; then
 else  
   AC_MSG_RESULT(***** You have decided to use csdp. Let's check whether it works or not *****)
   AC_MSG_CHECKING(for csdp)
-  AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,-L$csdp_path/lib -llapack -lblas -lm)
+  CSDP_LDFLAGS="-L$csdp_path/lib -lsdp -llapack -lblas -lm"
+  CSDP_CPPFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp"
+
+  AC_CHECK_LIB(sdp,easy_sdp, csdp_lib=yes, csdp_lib=no,$CSDP_LDFLAGS)
   
   CPPFLAGS_SAV=$CPPFLAGS
-  CPPFLAGS+="-I$csdp_path/include -I$csdp_path/include/csdp"
+  CPPFLAGS+=$CSDP_CPPFLAGS
   AC_CHECK_HEADER(declarations.h, csdp_header=yes, csdp_header=no, [])
   CPPFLAGS=$CPPFLAGS_SAV
 
+  
 
   if test "x$csdp_lib = xyes" -a "x$csdp_header = xyes" ; then
      csdp=yes;
@@ -264,11 +267,8 @@ else
      csdp=no;
   fi
   if test "x$csdp" = xyes; then 
-    CSDP_CFLAGS="-I$csdp_path/include -I$csdp_path/include/csdp"
-    AC_SUBST([CSDP_CFLAGS])  
-    CSDP_LDFLAGS="-L$csdp_path/lib"
-    AC_SUBST([CSDP_LDFLAGS])
-    SIMGRID_DEP="$SIMGRID_DEP $CSDP_LDFLAGS -lsdp -llapack -lblas -lm"
+    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])
   else
@@ -285,7 +285,7 @@ AC_CHECK_LIB(socket, connect,    [GRAS_DEP="$GRAS_DEP -lsocket"])
 AC_MSG_CHECKING(for extra dependencies of libgras)
 case $host_os in
   *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32";
-            AC_SUBST(AM_CFLAGS,-DDLL_EXPORT)
+            AM_CPPFLAGS="$AM_CPPFLAGS -DDLL_EXPORT"
             AC_DEFINE(CONTEXT_THREADS,1);;
 esac
 	   
@@ -319,9 +319,10 @@ then
 fi
 SG_COMPILE_FLAGS
 
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
+AC_SUBST([CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([LDFLAGS])
+AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([abs_builddir])
 AC_SUBST([abs_srcdir])
 AC_SUBST([abs_top_builddir])