[MOAB-dev] commit/MOAB: rajeeja: Changes for --disable-fortran option. Thanks Lorenzo.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/a8158ff78a6b/
Changeset:   a8158ff78a6b
Branch:      Version4.6
User:        rajeeja
Date:        2013-06-03 20:24:03
Summary:     Changes for --disable-fortran option. Thanks Lorenzo.

Affected #:  3 files

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index d10c95e..ca26bef 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,5 +1,3 @@
-Version 4.7pre:
-
 Version 4.6:
 * Removed deprecated functions from the Interface: (some overloaded variants of) query_interface, release_interface, 
   tag_get_data, tag_set_data, tag_get_size.

diff --git a/config/compiler.m4 b/config/compiler.m4
index 18df411..3a5d1a5 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 1524b06..79aba71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 ################################################################################
 #                           Standard Stuff
 ################################################################################
-AC_INIT(MOAB, 4.7.0pre)
+AC_INIT(MOAB, 4.6.0)
 AC_CONFIG_SRCDIR([moab.make.in])
 AC_CONFIG_SRCDIR([MOABConfig.cmake.in])
 AC_CONFIG_MACRO_DIR([config])
@@ -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.