From c033073bc00be5553f9f573efc252886ee958a5c Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Mon, 9 Feb 2009 14:48:02 +0000 Subject: [PATCH] *** empty log message *** --- Numeric/gmshAssembler.h | 4 ++-- configure | 17 +++++------------ configure.in | 17 +++++------------ 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Numeric/gmshAssembler.h b/Numeric/gmshAssembler.h index 195edbf328..43e664b75f 100644 --- a/Numeric/gmshAssembler.h +++ b/Numeric/gmshAssembler.h @@ -148,8 +148,8 @@ class gmshAssembler { for (unsigned int i = 0; i < itConstrR->second.size(); i++){ gmshDofKey &dofKeyConstrR = itConstrR->second[i].first; scalar valConstrR = itConstrR->second[i].second; - assemble(dofKeyConstrR.v,dofKeyConstrR.comp, dofKeyConstrR.field, - vC, iCompC, iFieldC, + assemble(dofKeyConstrR.v, dofKeyConstrR.comp, dofKeyConstrR.field, + vC, iCompC, iFieldC, val * valConstrR); } } diff --git a/configure b/configure index a30a64c6fe..f88f034848 100755 --- a/configure +++ b/configure @@ -5583,17 +5583,16 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -case "${F77}" in +if test "x$UNAME" != "xDarwin"; then + case "${F77}" in *gfortran*) F77LIB="-lgfortran" ;; *g77*) F77LIB="-lg2c" ;; - *) - F77LIB="" - ;; -esac + esac +fi if test "x${BLAS_LAPACK_PREFIX}" != "x"; then LDFLAGS="${LDFLAGS} -L${BLAS_LAPACK_PREFIX} -L${BLAS_LAPACK_PREFIX}/lib" fi @@ -5879,13 +5878,7 @@ if test "x${BLAS_LIBS}" != "x"; then else GMSH_LIBS="${GMSH_LIBS} ${BLAS_LIBS}" fi - case "$UNAME" in - Darwin*) - ;; - *) - GMSH_LIBS="${GMSH_LIBS} ${F77LIB}" - ;; - esac + GMSH_LIBS="${GMSH_LIBS} ${F77LIB}" fi if test "x$enable_mpi" = "xyes"; then diff --git a/configure.in b/configure.in index 27be9a48fa..9b895f1c46 100644 --- a/configure.in +++ b/configure.in @@ -709,17 +709,16 @@ fi dnl Check for blas and lapack AC_PROG_F77 -case "${F77}" in +if test "x$UNAME" != "xDarwin"; then + case "${F77}" in *gfortran*) F77LIB="-lgfortran" ;; *g77*) F77LIB="-lg2c" ;; - *) - F77LIB="" - ;; -esac + esac +fi if test "x${BLAS_LAPACK_PREFIX}" != "x"; then LDFLAGS="${LDFLAGS} -L${BLAS_LAPACK_PREFIX} -L${BLAS_LAPACK_PREFIX}/lib" fi @@ -747,13 +746,7 @@ if test "x${BLAS_LIBS}" != "x"; then else GMSH_LIBS="${GMSH_LIBS} ${BLAS_LIBS}" fi - case "$UNAME" in - Darwin*) - ;; - *) - GMSH_LIBS="${GMSH_LIBS} ${F77LIB}" - ;; - esac + GMSH_LIBS="${GMSH_LIBS} ${F77LIB}" fi dnl Check for MPI -- GitLab