Fix error detection of f2c.

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

diff --git a/buildtools/Cmake/Modules/FindF2c.cmake b/buildtools/Cmake/Modules/FindF2c.cmake
index 75121eb..16b1883 100644 (file)
--- a/buildtools/Cmake/Modules/FindF2c.cmake
+++ b/buildtools/Cmake/Modules/FindF2c.cmake
@@ -34,6 +34,10 @@ find_library(HAVE_F2C_LIB
     /usr
 )
 
     /usr
 )
 

+if(HAVE_F2C_H)
+set(HAVE_SMPI_F2C_H 1)
+endif(HAVE_F2C_H)
+

 mark_as_advanced(HAVE_F2C_H)
 mark_as_advanced(F2C_EXE)
 mark_as_advanced(HAVE_F2C_LIB)
\ No newline at end of file
 mark_as_advanced(HAVE_F2C_H)
 mark_as_advanced(F2C_EXE)
 mark_as_advanced(HAVE_F2C_LIB)
\ No newline at end of file

diff --git a/buildtools/Cmake/gras_config.h.in b/buildtools/Cmake/gras_config.h.in
index 0d9f3dc..5f12493 100644 (file)
--- a/buildtools/Cmake/gras_config.h.in
+++ b/buildtools/Cmake/gras_config.h.in
@@ -44,6 +44,8 @@
 #cmakedefine HAVE_CGRAPH_H @CGRAPH_H@
 #cmakedefine HAVE_AGRAPH_H @AGRAPH_H@
 
 #cmakedefine HAVE_CGRAPH_H @CGRAPH_H@
 #cmakedefine HAVE_AGRAPH_H @AGRAPH_H@
 

+/* Some variables needed for smpi */
+#cmakedefine HAVE_SMPI_F2C_H @HAVE_SMPI_F2C_H@

 
 /* Define if building universal (internal helper macro) */
 #cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@
 
 /* Define if building universal (internal helper macro) */
 #cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@

diff --git a/include/smpi/smpif.h b/include/smpi/smpif.h
index c0eca8b..43a1f9b 100644 (file)
--- a/include/smpi/smpif.h
+++ b/include/smpi/smpif.h
@@ -7,7 +7,14 @@
 #ifndef SMPIF_H
 #define SMPIF_H
 
 #ifndef SMPIF_H
 #define SMPIF_H
 

-#include <f2c.h>
+#include "gras_config.h" //For HAVE_SMPI_F2C_H
+
+#ifdef HAVE_SMPI_F2C_H
+       #undef min //Need because first def in xbt.h
+       #undef max //Need because first def in xbt.h
+       #include <f2c.h>
+#endif
+

 #include <xbt/misc.h>
 
 XBT_PUBLIC(int) smpi_process_argc(void);
 #include <xbt/misc.h>
 
 XBT_PUBLIC(int) smpi_process_argc(void);