From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 17 Nov 2010 13:05:01 +0000 (+0000)
Subject: Fix graphviz on Linux.
X-Git-Tag: v3_5~259
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5ce62344fd195b0cf910efcc89deb03362cfadb5

Fix graphviz on Linux.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8568 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 5bde0268f9..7c52b2344d 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -205,17 +205,20 @@ if(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
     if(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
     
         if(HAVE_GRAPH_H)
-        	string(REPLACE "/graphviz" "" file_graphviz_h ${HAVE_GRAPH_H})
+        	string(REPLACE "/graphviz/graph.h" "" file_graphviz_h ${HAVE_GRAPH_H})
+        	string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
         	set(GRAPH_H 1)
         endif(HAVE_GRAPH_H)
         
         if(HAVE_AGRAPH_H)
-        	string(REPLACE "/graphviz" "" file_graphviz_h ${HAVE_AGRAPH_H})
+        	string(REPLACE "/graphviz/agraph.h" "" file_graphviz_h ${HAVE_AGRAPH_H})
+        	string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
         	set(AGRAPH_H 1)
         endif(HAVE_AGRAPH_H)
         
         if(HAVE_CGRAPH_H)
-        	string(REPLACE "/graphviz" "" file_graphviz_h ${HAVE_CGRAPH_H})
+        	string(REPLACE "/graphviz/cgraph.h" "" file_graphviz_h ${HAVE_CGRAPH_H})
+        	string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
         	set(CGRAPH_H 1)
         endif(HAVE_CGRAPH_H)  
          
diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c
index 1381292357..1974cb86e0 100644
--- a/src/simdag/sd_dotloader.c
+++ b/src/simdag/sd_dotloader.c
@@ -13,16 +13,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
 
 #undef CLEANUP
 
-#ifdef HAVE_AGRAPH_H
+#ifdef HAVE_CGRAPH_H
+	#include <graphviz/cgraph.h>
+#elif HAVE_AGRAPH_H
 	#include <graphviz/agraph.h>
-#else
-	#ifdef HAVE_GRAPH_H
-		#include <graphviz/graph.h>
-	#else
-		#ifdef HAVE_CGRAPH_H
-			#include <graphviz/cgraph.h>
-		#endif
-	#endif
 #endif
 
 void dot_add_task(Agnode_t * dag_node);
@@ -127,10 +121,10 @@ xbt_dynar_t SD_dotload_FILE(FILE * in_file)
   for (dag_node = agfstnode(dag_dot); dag_node;
 	#ifdef HAVE_CGRAPH_H
        dag_node = agnxtnode(dag_dot, dag_node)) {
-    #endif
-	#ifdef HAVE_AGRAPH_H
+    #elif HAVE_AGRAPH_H
 	   dag_node = agnxtnode(dag_node)) {
 	#endif
+
   dot_add_task(dag_node);
   }
   agclose(dag_dot);
@@ -218,8 +212,7 @@ void dot_add_task(Agnode_t * dag_node)
 
   #ifdef HAVE_CGRAPH_H
 	  for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e)) {
-  #endif
-  #ifdef HAVE_AGRAPH_H
+  #elif HAVE_AGRAPH_H
 	  for (e = agfstin(dag_node); e; e = agnxtin(e)) {
   #endif
   dot_add_input_dependencies(current_job, e);
@@ -231,8 +224,7 @@ void dot_add_task(Agnode_t * dag_node)
   count = 0;
   #ifdef HAVE_CGRAPH_H
   	  for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e)) {
-  #endif
-  #ifdef HAVE_AGRAPH_H
+  #elif HAVE_AGRAPH_H
 	  for (e = agfstout(dag_node); e; e = agnxtout(e)) {
   #endif