[MOAB-dev] commit/MOAB: tautges: Backing out changes from 732016a that changed how fortran apps were linked.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/6a19421bba55/
Changeset:   6a19421bba55
Branch:      master
User:        tautges
Date:        2013-05-22 21:06:09
Summary:     Backing out changes from 732016a that changed how fortran apps were linked.
Too many machine dependencies in this approach, and ended up not fixing
probs on IBM BG.

Affected #:  3 files

diff --git a/config/compiler.m4 b/config/compiler.m4
index e869c33..81596a6 100644
--- a/config/compiler.m4
+++ b/config/compiler.m4
@@ -126,8 +126,6 @@ fi
 if test "xno" != "x$CHECK_FC"; then
   AC_PROG_FC
   AC_PROG_F77
-  AC_F77_LIBRARY_LDFLAGS
-  AC_FC_LIBRARY_LDFLAGS
 fi
 
 ]) # FATHOM_CHECK_COMPILERS

diff --git a/configure.ac b/configure.ac
index 1524b06..c9d6387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,14 +67,6 @@ if test "xyes" = "x$ENABLE_FORTRAN" && test "x" != "x$FC"; then
   AC_FC_WRAPPERS
 fi
 
-if test "xyes" = "x$ENABLE_FORTRAN" && test "x" != "x$FLIBS"; then
-   LIBS="$LIBS $FLIBS"
-fi
-
-if test "xyes" = "x$ENABLE_FORTRAN" && test "x" != "x$FCLIBS"; then
-   LIBS="$LIBS $FCLIBS"
-fi
-
 ################################################################################
 #                           Check for need for extra flags to support cray pointers
 ################################################################################
@@ -1230,10 +1222,10 @@ AC_OUTPUT
 AC_MSG_RESULT([C:   $CC $CFLAGS $CPPFLAGS])
 AC_MSG_RESULT([C++: $CXX $CXXFLAGS $CPPFLAGS])
 if test "x" != "x$FC"; then
-  AC_MSG_RESULT([Fortran: $FC $FCFLAGS])
+  AC_MSG_RESULT([Fortran90: $FC $FCFLAGS])
 fi
 if test "x" != "x$F77"; then
-  AC_MSG_RESULT([Fortran: $F77 $FFLAGS])
+  AC_MSG_RESULT([Fortran77: $F77 $FFLAGS])
 fi
 
 if test "x$HAVE_HDF5" = "xno"; then

diff --git a/itaps/imesh/Makefile.am b/itaps/imesh/Makefile.am
index 97c76bb..647b8c1 100644
--- a/itaps/imesh/Makefile.am
+++ b/itaps/imesh/Makefile.am
@@ -45,9 +45,6 @@ if PARALLEL
 #  ftest_DEPENDENCIES = libiMesh.la $(top_builddir)/libMOAB.la 
 endif
 
-FCLINK = $(CXXLINK)
-F77LINK = $(CXXLINK)
-
 TESTS = $(check_PROGRAMS)
 LDADD = libiMesh.la $(top_builddir)/src/libMOAB.la ${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}
 TESTDEPS = libiMesh.la $(top_builddir)/src/libMOAB.la

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.