[MOAB-dev] commit/MOAB: rajeeja: Adding to master branch, Changes for --disable-fortran option. Thanks Lorenzo.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/86fbb11de7eb/
Changeset:   86fbb11de7eb
Branch:      master
User:        rajeeja
Date:        2013-06-03 20:34:33
Summary:     Adding to master branch, Changes for --disable-fortran option. Thanks Lorenzo.

Affected #:  2 files

diff --git a/config/compiler.m4 b/config/compiler.m4
index 81596a6..6a7e2ed 100644
--- a/config/compiler.m4
+++ b/config/compiler.m4
@@ -102,15 +102,27 @@ if test "xno" != "x$WITH_MPI"; then
   DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-mpi=\"${withval}\""
   
   if test "xyes" == "x$WITH_MPI"; then
+    if test "xno" != "x$CHECK_CC"; then  
     FATHOM_SET_MPI_COMPILER([CC],  [$CC_LIST])
+    fi
+    if test "xno" != "x$CHECK_CXX"; then  
     FATHOM_SET_MPI_COMPILER([CXX],[$CXX_LIST])
-    FATHOM_SET_MPI_COMPILER([FC],  [$FC_LIST])
-    FATHOM_SET_MPI_COMPILER([F77],[$F77_LIST])
+    fi
+    if test "xno" != "x$CHECK_FC"; then  
+      FATHOM_SET_MPI_COMPILER([FC],  [$FC_LIST])
+      FATHOM_SET_MPI_COMPILER([F77],[$F77_LIST])
+    fi
   else
+    if test "xno" != "x$CHECK_CC"; then  
     FATHOM_SET_MPI_COMPILER([CC],  [$CC_LIST],[${WITH_MPI}/bin])
+    fi
+    if test "xno" != "x$CHECK_CXX"; then  
     FATHOM_SET_MPI_COMPILER([CXX],[$CXX_LIST],[${WITH_MPI}/bin])
-    FATHOM_SET_MPI_COMPILER([FC],  [$FC_LIST],[${WITH_MPI}/bin])
-    FATHOM_SET_MPI_COMPILER([F77],[$F77_LIST],[${WITH_MPI}/bin])
+    fi
+    if test "xno" != "x$CHECK_FC"; then
+      FATHOM_SET_MPI_COMPILER([FC],  [$FC_LIST],[${WITH_MPI}/bin])
+      FATHOM_SET_MPI_COMPILER([F77],[$F77_LIST],[${WITH_MPI}/bin])
+    fi
     WITH_MPI=yes
   fi
 fi

diff --git a/configure.ac b/configure.ac
index 130e4a9..873e2ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,9 +24,9 @@ AC_ARG_ENABLE([fortran],[AC_HELP_STRING([--disable-fortran],
 
 EXTRA_GNU_FLAGS='-Wall -pipe -pedantic -Wno-long-long -Wextra -Wcast-align  -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused-parameter'
 EXTRA_INTEL_FLAGS='-Wall'
-FATHOM_CHECK_COMPILERS([yes],[yes],[$ENABLE_FORTRAN])
 AM_CONDITIONAL(PARALLEL,[test "x$WITH_MPI" != "xno"])
 AM_CONDITIONAL(ENABLE_FORTRAN,[test "x$ENABLE_FORTRAN" != "xno"])
+FATHOM_CHECK_COMPILERS([yes],[yes],[$ENABLE_FORTRAN])
 LIBS="$LIBS -lm"
 
 AC_PROG_LN_S

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.